X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.in;h=f65f9f7ac11915842f8f3eeb3f98185f0bce37b9;hb=764174dc1d4b5965c9cbb8f3dbfbf72ebab1ee8a;hp=f65d6ced87401c576c75bbcb3e6080a4b06d5cc7;hpb=a0e673561a9eeb0fc18e0b7608e9e18c55321643;p=chaz%2Ftar

diff --git a/src/Makefile.in b/src/Makefile.in
index f65d6ce..f65f9f7 100644
--- 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,7 +105,7 @@ 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 \
@@ -116,7 +116,7 @@ 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