summaryrefslogtreecommitdiff
path: root/src/backend/utils/misc/Makefile
diff options
context:
space:
mode:
authorPeter Eisentraut2000-08-28 11:53:23 +0000
committerPeter Eisentraut2000-08-28 11:53:23 +0000
commitf03fc94e7df1078959a4fa4a4b5c4e02b09a2bc1 (patch)
tree1aadad9c51a781f608d1820000a4478dbf00aa83 /src/backend/utils/misc/Makefile
parent4c8d2f7f7b129d8fd679bb970345593ac6190725 (diff)
New configure test for flex, which recognizes only flex but does so in all
incarnations (I hope). When an acceptable flex version is not found, print instructive error messages from both configure and the makefiles, so that users can continue building anyway.
Diffstat (limited to 'src/backend/utils/misc/Makefile')
-rw-r--r--src/backend/utils/misc/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index d5f5843a738..140ce9df17c 100644
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.17 2000/08/25 10:00:31 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.18 2000/08/28 11:53:20 petere Exp $
subdir = src/backend/utils/misc
top_builddir = ../../../..
@@ -19,18 +19,19 @@ SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
guc-file.c: guc-file.l
- $(LEX) $(LFLAGS) $<
- sed -e 's/lex\.yy\.c/guc-file\.c/g' \
- -e 's/^yy/GUC_yy/g' \
- -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' < lex.yy.c > $@
+ifdef FLEX
+ $(FLEX) $(FLEXFLAGS) $<
+ sed -e 's/^yy/GUC_yy/g' -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' lex.yy.c > $@
rm -f lex.yy.c
-
+else
+ @$(missing) flex $< $@
+endif
# Note: guc-file.c is not deleted by 'make clean',
# since we want to ship it in distribution tarballs.
-
clean:
- rm -f SUBSYS.o $(OBJS) lex.yy.c
+ rm -f SUBSYS.o $(OBJS)
+ @rm -f lex.yy.c
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend