Simplify overly-clever Make rule, which evidently confuses at least

some versions of gmake (mine didn't do the right thing, anyway).

diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index de0a048..30c7f76 100644 (file)
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -4,12 +4,12 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.14 2000/05/31 00:28:34 petere Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.15 2000/06/01 14:52:25 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
-include ../../../Makefile.global
+include $(SRCDIR)/Makefile.global
 
 OBJS = database.o superuser.o guc.o guc-file.o
 
@@ -18,24 +18,23 @@ all: SUBSYS.o
 SUBSYS.o: $(OBJS)
        $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
-.SECONDARY: guc-file.c
-.INTERMEDIATE: lex.yy.c
-
-guc-file.c: lex.yy.c
+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' < $< > $@
+           -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' < lex.yy.c > $@
+       rm -f lex.yy.c
 
-lex.yy.c: guc-file.l
-       $(LEX) $(LFLAGS) $<
 
-
-depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
+# 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
 
+depend dep:
+       $(CC) -MM $(CFLAGS) *.c >depend
+
 ifeq (depend,$(wildcard depend))
 include depend
 endif