add DESTDIR support and .PHONY

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4572 ec53bebd-3082-4978-b11e-865c3cabbd6b

appl/ftp/Makefile.in

@@ -39,3 +39,5 @@ distclean:
 	for i in $(SUBDIRS); \
 	do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
 	rm -f Makefile *~
+
+.PHONY: all install uninstall clean cleandir distclean

appl/ftp/common/Makefile.in

@@ -50,3 +50,5 @@ distclean:
 	rm -f Makefile
 
 $(OBJECTS): ../../../include/config.h
+
+.PHONY: all install uninstall clean cleandir distclean

appl/ftp/ftp/Makefile.in

@@ -51,14 +51,14 @@ all: $(PROGS)
 	$(CC) -c -I$(srcdir) -I../../../include $(DEFS) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	for x in $(PROGS); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 ftp$(EXECSUFFIX): $(ftp_OBJS) # ../common/libcommon.a
@@ -74,3 +74,5 @@ distclean:
 	rm -f Makefile
 
 $(OBJECTS): ../../../include/config.h
+
+.PHONY: all install uninstall clean cleandir distclean

appl/ftp/ftpd/Makefile.in

@@ -56,14 +56,14 @@ all: $(PROGS)
 	$(CC) -c -I$(srcdir) -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libexecdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
 	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	for x in $(PROGS); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 ftpd$(EXECSUFFIX): $(ftpd_OBJS)
@@ -82,3 +82,5 @@ clean cleandir:
 
 distclean: 
 	rm -f Makefile
+
+.PHONY: all install uninstall clean cleandir distclean

appl/kx/Makefile.in

@@ -54,20 +54,20 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../kauth $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir)
 	PROG_BIN='$(PROG_BIN)'; for x in $$PROG_BIN; do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	PROG_LIBEXEC='$(PROG_LIBEXEC)'; for x in $$PROG_LIBEXEC; do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	PROG_BIN='$(PROG_BIN)'; for x in $$PROG_BIN; do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	PROG_LIBEXEC='$(PROG_LIBEXEC)'; for x in $$PROG_LIBEXEC; do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 TAGS: $(SOURCES)
@@ -117,3 +117,5 @@ tenletxr: tenletxr.in
 	chmod +x $@
 
 $(OBJECTS): ../../include/config.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

appl/otp/Makefile.in

@@ -44,20 +44,20 @@ all: $(PROGS)
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	for x in $(PROG_BIN); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	-for x in $(PROG_SUIDBIN); do \
-	  $(INSTALL_PROGRAM) -o root -m 04555 $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) -o root -m 04555 $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	for x in $(PROG_BIN); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	for x in $(PROG_SUIDBIN); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 TAGS: $(SOURCES)
@@ -86,3 +86,5 @@ otpprint$(EXECSUFFIX): $(OBJECTS_OTPPRINT)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
+
+.PHONY: all install uninstall check clean mostlyclean distclean realclean

appl/popper/Makefile.in

@@ -65,14 +65,14 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
 	for x in $(PROG_LIBEXEC); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	for x in $(PROG_LIBEXEC); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 TAGS: $(SOURCES)
@@ -108,3 +108,5 @@ pop_debug$(EXECSUFFIX): $(POP_DEBUG_OBJECTS)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POP_DEBUG_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

appl/telnet/Makefile.in

@@ -37,3 +37,5 @@ distclean:
 	for i in $(SUBDIRS); \
 	do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
 	rm -f Makefile *~
+
+.PHONY: all install uninstall clean cleandir distclean

appl/telnet/libtelnet/Makefile.in

@@ -48,3 +48,5 @@ clean cleandir:
 
 distclean: clean
 	rm -f Makefile *~
+
+.PHONY: all install uninstall clean cleandir distclean

appl/telnet/telnet/Makefile.in

@@ -51,14 +51,14 @@ telnet$(EXECSUFFIX): $(OBJECTS)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
 
 install: all
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	for x in $(PROGS); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 TAGS: $(SOURCES)
@@ -69,3 +69,5 @@ clean cleandir:
 
 distclean: clean
 	rm -f Makefile *~
+
+.PHONY: all install uninstall clean cleandir distclean

appl/telnet/telnetd/Makefile.in

@@ -54,14 +54,14 @@ telnetd$(EXECSUFFIX): $(OBJECTS)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
 
 install: all
-	$(MKINSTALLDIRS) $(libexecdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
 	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
 	for x in $(PROGS); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(libexecdir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 TAGS: $(SOURCES)
@@ -73,3 +73,5 @@ clean cleandir:
 distclean: clean
 	rm -f Makefile *~
 
+
+.PHONY: all install uninstall clean cleandir distclean

appl/xnlock/Makefile.in

@@ -50,22 +50,22 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	PROG_BIN='$(PROG_BIN)'; for x in $$PROG_BIN; do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
-	$(MKINSTALLDIRS) $(mandir)/man1
+	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
 	(cd $(srcdir); \
 	for x in $(MAN1); do \
-	  $(INSTALL_DATA) $$x $(mandir)/man1/`echo $$x | sed '$(transform)' | sed 's/\.man/.1/'`; \
+	  $(INSTALL_DATA) $$x $(DESTDIR)$(mandir)/man1/`echo $$x | sed '$(transform)' | sed 's/\.man/.1/'`; \
 	done)
 
 uninstall:
 	PROG_BIN='$(PROG_BIN)'; for x in $$PROG_BIN; do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	for x in $(MAN1); do \
-	  rm -f $(mandir)/man1/`echo $$x | sed '$(transform)' | sed 's/\.man/.1/'`; \
+	  rm -f $(DESTDIR)$(mandir)/man1/`echo $$x | sed '$(transform)' | sed 's/\.man/.1/'`; \
 	done
 
 TAGS: $(SOURCES)
@@ -97,3 +97,5 @@ xnlock$(EXECSUFFIX): xnlock.o
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/auth/Makefile.in

@@ -51,3 +51,5 @@ realclean:
 		SUBDIRS=$(SUBDIRS); \
 		for i in $$SUBDIRS; \
 		do (cd $$i && $(MAKE) $(MFLAGS) realclean); done
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean

lib/auth/afskauthlib/Makefile.in

@@ -42,12 +42,15 @@ Wall:
 	$(CC) -c $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	-if test "$(LIB)" != ""; then \
-	 $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) ; \
+	 $(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB) ; \
 	fi
 
 uninstall:
+	-if test "$(LIB)" != ""; then \
+	 rm -f $(DESTDIR)$(libdir)/$(LIB) ; \
+	fi
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -76,3 +79,5 @@ $(OBJECTS): ../../../include/config.h
 $(LIB): $(OBJECTS)
 	rm -f $@
 	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -lkafs -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/auth/pam/Makefile.in

@@ -41,12 +41,15 @@ Wall:
 	$(CC) -c $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	-if test "$(LIB)" != ""; then \
-	  $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) ; \
+	  $(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB) ; \
 	fi
 
 uninstall:
+	-if test "$(LIB)" != ""; then \
+	  rm -f $(DESTDIR)$(libdir)/$(LIB) ; \
+	fi
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -77,3 +80,5 @@ $(LIB): $(OBJECTS)
 	rm -f $@
 	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -L../../krb -L../../des -L../../roken -lkafs -lkrb -ldes -lroken
 #	$(CC) -shared -Wl,-x -o $(LIB) $(OBJECTS)  ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/auth/sia/Makefile.in

@@ -42,12 +42,15 @@ Wall:
 	$(CC) -c $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	-if test "$(LIB)" != ""; then \
-	  $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) ; \
+	  $(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB) ; \
 	fi
 
 uninstall:
+	-if test "$(LIB)" != ""; then \
+	  rm -f $(DESTDIR)$(libdir)/$(LIB) ; \
+	fi
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -77,3 +80,5 @@ $(OBJECTS): ../../../include/config.h
 $(LIB): $(OBJECTS)
 	rm -f $@
 	$(LDSHARED) -shared -o $@ -rpath $(libdir) -hidden -exported_symbol siad_\* $(OBJECTS) -L../../kafs -lkafs -L../../kadm -lkadm -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken @LIB_getpwnam_r@ -lc
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/com_err/Makefile.in

@@ -52,25 +52,35 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(includedir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
 	@for i in $(include_HEADERS); do \
 	if test -f "$(srcdir)/$$i" ; then x="$(srcdir)/$$i"; \
 	else x="$$i"; fi ;\
-	echo "$(INSTALL_DATA) $$x $(includedir)" ;\
+	echo "$(INSTALL_DATA) $$x $(DESTDIR)$(includedir)/$$i" ;\
-	$(INSTALL_DATA) $$x $(includedir) ; done
+	$(INSTALL_DATA) $$x $(DESTDIR)$(includedir)/$$i ; done
 
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	@for i in $(lib_LIBRARIES); do \
-	echo "$(INSTALL) -m 0555 $$i $(libdir)" ;\
+	echo "$(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i" ;\
-	$(INSTALL) -m 0555 $$i $(libdir) ; done
+	$(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i ; done
 
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	@for i in $(bin_PROGRAMS); do \
-	echo "$(INSTALL) -m 0555 $$i $(bindir)" ;\
+	echo "$(INSTALL) -m 0555 $$i $(DESTDIR)$(bindir)/$$i" ;\
-	$(INSTALL) -m 0555 $$i $(bindir) ; done
+	$(INSTALL) -m 0555 $$i $(DESTDIR)$(bindir)/$$i ; done
 
 uninstall:
-	rm -f $(libdir)/$(LIB)
+	@for i in $(include_HEADERS); do \
+	echo "rm -f $(DESTDIR)$(includedir)/$$x" ;\
+	rm -f $(DESTDIR)$(includedir)/$$i ; done
+
+	@for i in $(lib_LIBRARIES); do \
+	echo "rm -f $(DESTDIR)$(libdir)/$$i" ;\
+	rm -f $(DESTDIR)$(libdir)/$$i ; done
+
+	@for i in $(bin_PROGRAMS); do \
+	echo "rm -f $(DESTDIR)$(bindir)/$$i" ;\
+	rm -f $(DESTDIR)$(bindir)/$$i ; done
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -118,3 +128,5 @@ parse.c parse.h: $(srcdir)/parse.y
 lex.c: $(srcdir)/lex.l
 	$(LEX) $(srcdir)/lex.l
 	mv -f lex.yy.c lex.c
+
+.PHONY: all Wall install uninstall clean mostlyclean distclean realclean dist

lib/des/Makefile.in

@@ -74,17 +74,17 @@ des_enc.o: des_enc.c
 	fi
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
+	$(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	for x in $(PROGS2INSTALL); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 uninstall:
-	rm -f $(libdir)/$(LIB)
+	rm -f $(DESTDIR)$(libdir)/$(LIB)
 	for x in $(PROGS2INSTALL); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 
 TAGS: $(LIBSRC)
@@ -149,3 +149,5 @@ speed$(EXECSUFFIX): speed.o $(LIB)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes
 
 $(LIBOBJ): ../../include/config.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/editline/Makefile.in

@@ -43,11 +43,11 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
+	$(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
 
 uninstall:
-	rm -f $(libdir)/$(LIB)
+	rm -f $(DESTDIR)$(libdir)/$(LIB)
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -82,3 +82,5 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	$(LDSHARED) -o $@ $(OBJECTS)
 
 $(OBJECTS): ../../include/config.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/kafs/Makefile.in

@@ -45,15 +45,15 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	@for i in $(LIB); do \
-	echo "$(INSTALL) -m 0555 $$i $(libdir)" ;\
+	echo "$(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i" ;\
-	$(INSTALL) -m 0555 $$i $(libdir) ; done
+	$(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i ; done
 
 uninstall:
 	@for i in $(LIB); do \
-	echo "rm -f $(libdir)/$$i" ;\
+	echo "rm -f $(DESTDIR)$(libdir)/$$i" ;\
-	rm -f $(libdir)/$$i ; done
+	rm -f $(DESTDIR)$(libdir)/$$i ; done
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -93,3 +93,5 @@ afslib.so: afslib.o
 	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp @AFS_EXTRA_LD@ afslib.o
 
 $(OBJECTS): ../../include/config.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

lib/otp/Makefile.in

@@ -58,11 +58,11 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
+	$(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
 
 uninstall:
-	rm -f $(libdir)/$(LIB)
+	rm -f $(DESTDIR)$(libdir)/$(LIB)
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -95,4 +95,4 @@ $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
 
 $(OBJECTS): ../../include/config.h
 
-.PHONY: all install uninstall check clean mostlyclean distclean realclean
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean

lib/roken/Makefile.in

@@ -171,3 +171,5 @@ install-roken-h: roken.h
 	$(INSTALL) roken.h ../../include/roken.h; fi
 
 $(OBJECTS): ../../include/config.h roken.h
+
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist install-roken-h

lib/sl/Makefile.in

@@ -55,16 +55,18 @@ Wall:
 	$(CC) -c $(DEFS) -I../../include -I. -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
-	$(MKINSTALLDIRS) $(includedir)/ss
+	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)/ss
-	$(INSTALL_DATA) $(srcdir)/ss.h $(includedir)/ss
+	$(INSTALL_DATA) $(srcdir)/ss.h $(DESTDIR)$(includedir)/ss/ss.h
-	$(MKINSTALLDIRS) $(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-	$(INSTALL) -m 555 $(sl_LIB) $(libdir)/$(sl_LIB)
+	$(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(sl_LIB)
-	$(INSTALL) -m 555 $(sl_LIB) $(libdir)/$(ss_LIB)
+	$(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB)
-	$(MKINSTALLDIRS) $(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-	$(INSTALL) -m 0555 $(PROGS) $(bindir)
+	$(INSTALL) -m 0555 $(PROGS) $(DESTDIR)$(bindir)/$(PROGS)
 
 uninstall:
-	rm -f $(libdir)/$(sl_LIB) $(libdir)/$(ss_LIB)
+	rm -f $(DESTDIR)$(includedir)/ss/ss.h
+	rm -f $(DESTDIR)$(libdir)/$(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB)
+	rm -f $(DESTDIR)$(bindir)/$(PROGS)
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
@@ -107,4 +109,4 @@ lex.c: $(srcdir)/lex.l
 	$(LEX) $(srcdir)/lex.l
 	mv -f lex.yy.c lex.c
 
-.PHONY: all install uninstall check clean mostlyclean distclean realclean
+.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean