Insert `_' macro around many string constants.

[bison.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d3879116d240d463e51e0cb864ff637ae3f6c194..d4e9e79504f0fee2500090ca639cdf7277bcfc49 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,8 @@ MAKEINFO = makeinfo
 # -DHAVE_STRERROR      If you have strerror function.
 DEFS = @DEFS@
 
-CFLAGS = -g
-LDFLAGS =
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
 
 LIBS = @LIBS@
 
@@ -44,14 +44,14 @@ LIBS = @LIBS@
 # the GNU alloca.o here.
 ALLOCA = @ALLOCA@
 
-prefix = /usr/local
-exec_prefix = $(prefix)
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
 # where the installed binary goes
 bindir = $(exec_prefix)/bin
 
 # where the parsers go
-datadir = $(prefix)/lib
+datadir = $(prefix)/share
 
 # where the info files go
 infodir = $(prefix)/info
@@ -70,8 +70,8 @@ DISTFILES = COPYING ChangeLog Makefile.in configure configure.in \
     output.c print.c reader.c reduce.c symtab.c version.c \
     warshall.c files.h gram.h lex.h machine.h new.h state.h \
     symtab.h system.h types.h bison.cld build.com vmsgetargs.c \
-    vmshlp.mar README INSTALL bison.texinfo bison.info* texinfo.tex \
-    getopt.c getopt.h getopt1.c alloca.c mkinstalldirs
+    vmshlp.mar README INSTALL NEWS bison.texinfo bison.info* texinfo.tex \
+    getopt.c getopt.h getopt1.c alloca.c mkinstalldirs install-sh
 
 
 SHELL = /bin/sh
@@ -96,27 +96,28 @@ OBJECTS = LR0.o allocate.o closure.o conflicts.o derives.o files.o  \
 
 all: bison bison.info bison.s1
 
-Makefile: Makefile.in config.status
-       ./config.status
+Makefile: config.status Makefile.in
+       CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 
 config.status: configure
        ./config.status --recheck
 
 configure: configure.in
-       cd $(srcdir); autoconf
+       cd $(srcdir) && autoconf
 
 # Copy bison.simple, inserting directory name into the #line commands.
 bison.s1: bison.simple
        -rm -f bison.s1
-       sed -e "/^#line/ s|bison|$(datadir)/bison|" < $(srcdir)/$(PFILE) > bison.s1
+       sed -e "/^#line/ s|bison|$(datadir)/bison|" < $(srcdir)/$(PFILE) > $@-tmp
+       mv $@-tmp $@
 
 clean:
-       rm -f *.o core bison bison.s1
+       rm -f *.o core bison bison.s1 config.status config.log
 
 mostlyclean: clean
 
 distclean: clean
-       rm -f Makefile config.status
+       rm -f Makefile
 
 realclean: distclean
        rm -f TAGS *.info*
@@ -124,13 +125,11 @@ realclean: distclean
 # Most of these deps are in case using RCS.
 install: all bison.1 $(srcdir)/$(PFILE) $(srcdir)/$(PFILE1) installdirs uninstall
        $(INSTALL_PROGRAM) bison $(bindir)/bison
-       $(INSTALL_DATA) ./bison.s1 $(datadir)/$(PFILE)
+       $(INSTALL_DATA) bison.s1 $(datadir)/$(PFILE)
        $(INSTALL_DATA) $(srcdir)/$(PFILE1) $(datadir)/$(PFILE1)
-       -chmod a+r $(datadir)/$(PFILE) $(datadir)/$(PFILE1) 
-       -$(INSTALL_DATA) $(srcdir)/bison.1 $(mandir)/bison.$(manext)
-       -chmod a+r $(mandir)/bison.$(manext)
        cd $(srcdir); for f in bison.info*; \
        do $(INSTALL_DATA) $$f $(infodir)/$$f; done
+       -$(INSTALL_DATA) $(srcdir)/bison.1 $(mandir)/bison.$(manext)
 
 # Make sure all installation directories, e.g. $(bindir) actually exist by
 # making them if necessary.
@@ -148,12 +147,15 @@ check:
 bison: $(OBJECTS)
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS)
 
+# We don't use $(srcdir) in this rule
+# because it is normally used in the master source dir
+# in which configure has not been run.
 dist: bison.info
        echo bison-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q version.c` > .fname
        -rm -rf `cat .fname`
        mkdir `cat .fname`
        dst=`cat .fname`; for f in $(DISTFILES); do \
-          ln $(srcdir)/$$f $$dst/$$f || { echo copying $$f; cp -p $(srcdir)/$$f $$dst/$$f ; } \
+          ln $$f $$dst/$$f || { echo copying $$f; cp -p $$f $$dst/$$f ; } \
        done
        tar --gzip -chf `cat .fname`.tar.gz `cat .fname`
        -rm -rf `cat .fname` .fname
@@ -170,6 +172,7 @@ files.o: files.c
           $(srcdir)/files.c $(OUTPUT_OPTION)
 
 LR0.o: system.h machine.h new.h gram.h state.h
+allocate.o: system.h
 closure.o: system.h machine.h new.h gram.h
 conflicts.o: system.h machine.h new.h files.h gram.h state.h
 derives.o: system.h new.h types.h gram.h