Global extended_header removed, use new xheader calls instead.

[chaz/tar] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index b4d06993063f6f3db4c76dcdbcc9266262e881f2..f65f9f7ac11915842f8f3eeb3f98185f0bce37b9 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -87,7 +87,7 @@ binprefix =
 bindir = $(exec_prefix)/bin
 
 # Where to put the rmt executable.
-libdir = /etc
+libdir = $(exec_prefix)/lib
 
 # The directory to install the info files in.
 infodir = $(prefix)/info
@@ -105,18 +105,18 @@ OBJ2 =    version.o list.o names.o diffarch.o port.o fnmatch.o getopt.o @MALLOC@
 OBJ3 =  getopt1.o regex.o getdate.o $(RTAPELIB) @ALLOCA@
 OBJS = $(OBJ1) $(OBJ2) $(OBJ3)
 AUX =   README INSTALL NEWS COPYING ChangeLog Makefile.in makefile.pc \
-       configure configure.in \
+       configure configure.in mkinstalldirs \
        tar.h fnmatch.h pathmax.h port.h open3.h getopt.h regex.h \
        rmt.h rmt.c rtapelib.c \
        msd_dir.h msd_dir.c tcexparg.c \
        level-0 level-1 backup-specs dump-remind testpad.c getpagesize.h
-#      tar.texinfo tar.info* texinfo.tex \
+#      tar.texinfo tar.info* texinfo.tex
 
 all:   @PROGS@ 
 # tar.info
 
 .c.o:
-       $(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $<
+       $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $<
 
 tar:   $(OBJS)
        $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
@@ -127,7 +127,7 @@ rmt:        rmt.c
 tar.info: tar.texinfo
        makeinfo $(srcdir)/tar.texinfo
 
-install: all
+install: all installdirs
        $(INSTALL_PROGRAM) tar $(bindir)/$(binprefix)tar
        -test ! -f rmt || $(INSTALL_PROGRAM) rmt $(libdir)/rmt
 #      for file in $(srcdir)/tar.info*; \
@@ -138,6 +138,16 @@ uninstall:
        rm -f $(bindir)/$(binprefix)tar $(infodir)/tar.info*
        -rm -f $(libdir)/rmt
 
+installdirs:
+       $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(libdir) $(infodir)
+
+Makefile: Makefile.in config.status
+       $(SHELL) config.status
+config.status: configure
+       $(SHELL) config.status --recheck
+configure: configure.in
+       cd $(srcdir); autoconf
+
 $(OBJS): tar.h pathmax.h port.h testpad.h
 regex.o buffer.o tar.o: regex.h
 tar.o fnmatch.o: fnmatch.h
@@ -168,14 +178,15 @@ realclean: distclean
        rm -f TAGS *.info* getdate.c y.tab.c
 
 shar: $(SRCS) $(AUX)
-       shar $(SRCS) $(AUX) | compress > tar-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q version.c`.shar.Z
+       shar $(SRCS) $(AUX) | gzip > tar-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q version.c`.shar.z
 
 dist: $(SRCS) $(AUX)
        echo tar-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q version.c` > .fname
        -rm -rf `cat .fname`
        mkdir `cat .fname`
-       ln $(SRCS) $(AUX) `cat .fname`
-       tar chZf `cat .fname`.tar.Z `cat .fname`
+       for file in $(SRCS) $(AUX); do \
+          ln $$file `cat .fname` || cp $$file `cat .fname`; done
+       tar chzf `cat .fname`.tar.z `cat .fname`
        -rm -rf `cat .fname` .fname
 
 tar.zoo: $(SRCS) $(AUX)