From 6554532c43401fd13f2ead20c25f976c19ba04b7 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 15 Mar 1998 05:58:31 +0000 Subject: [PATCH] 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 | 2 ++ appl/ftp/common/Makefile.in | 2 ++ appl/ftp/ftp/Makefile.in | 8 +++++--- appl/ftp/ftpd/Makefile.in | 8 +++++--- appl/kx/Makefile.in | 12 +++++++----- appl/otp/Makefile.in | 12 +++++++----- appl/popper/Makefile.in | 8 +++++--- appl/telnet/Makefile.in | 2 ++ appl/telnet/libtelnet/Makefile.in | 2 ++ appl/telnet/telnet/Makefile.in | 8 +++++--- appl/telnet/telnetd/Makefile.in | 8 +++++--- appl/xnlock/Makefile.in | 14 ++++++++------ lib/auth/Makefile.in | 2 ++ lib/auth/afskauthlib/Makefile.in | 9 +++++++-- lib/auth/pam/Makefile.in | 9 +++++++-- lib/auth/sia/Makefile.in | 9 +++++++-- lib/com_err/Makefile.in | 32 +++++++++++++++++++++---------- lib/des/Makefile.in | 14 ++++++++------ lib/editline/Makefile.in | 8 +++++--- lib/kafs/Makefile.in | 12 +++++++----- lib/otp/Makefile.in | 8 ++++---- lib/roken/Makefile.in | 2 ++ lib/sl/Makefile.in | 20 ++++++++++--------- 23 files changed, 137 insertions(+), 74 deletions(-) diff --git a/appl/ftp/Makefile.in b/appl/ftp/Makefile.in index 9f2c24a65..ce88b08f0 100644 --- a/appl/ftp/Makefile.in +++ b/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 diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in index 2e6143097..2b8b14293 100644 --- a/appl/ftp/common/Makefile.in +++ b/appl/ftp/common/Makefile.in @@ -50,3 +50,5 @@ distclean: rm -f Makefile $(OBJECTS): ../../../include/config.h + +.PHONY: all install uninstall clean cleandir distclean diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in index 49a466faa..ec67be30c 100644 --- a/appl/ftp/ftp/Makefile.in +++ b/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 diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in index c1d6c48f8..6df23c61b 100644 --- a/appl/ftp/ftpd/Makefile.in +++ b/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 diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in index 4b1d7c4d2..0654a2d70 100644 --- a/appl/kx/Makefile.in +++ b/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 diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in index e870ef177..6e370939a 100644 --- a/appl/otp/Makefile.in +++ b/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 diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in index 8fba49cb7..982dd7b7a 100644 --- a/appl/popper/Makefile.in +++ b/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 diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in index 93ee0fc0f..4c5cae1e1 100644 --- a/appl/telnet/Makefile.in +++ b/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 diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in index b1e34f13a..8e8870351 100644 --- a/appl/telnet/libtelnet/Makefile.in +++ b/appl/telnet/libtelnet/Makefile.in @@ -48,3 +48,5 @@ clean cleandir: distclean: clean rm -f Makefile *~ + +.PHONY: all install uninstall clean cleandir distclean diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in index 1c62c12c8..a104eb918 100644 --- a/appl/telnet/telnet/Makefile.in +++ b/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 diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index cf1d59c4c..b72582e70 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/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 diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in index 482902681..94577e3c7 100644 --- a/appl/xnlock/Makefile.in +++ b/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 diff --git a/lib/auth/Makefile.in b/lib/auth/Makefile.in index c9a457a57..d86dd9a1a 100644 --- a/lib/auth/Makefile.in +++ b/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 diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in index 6d4daa2be..b41e49c78 100644 --- a/lib/auth/afskauthlib/Makefile.in +++ b/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 diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in index 0c2be7f3f..85d5613c9 100644 --- a/lib/auth/pam/Makefile.in +++ b/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 diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in index 23c3515bd..026dfd66d 100644 --- a/lib/auth/sia/Makefile.in +++ b/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 diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in index e03c2dbab..0844b3ae3 100644 --- a/lib/com_err/Makefile.in +++ b/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)" ;\ - $(INSTALL_DATA) $$x $(includedir) ; done + echo "$(INSTALL_DATA) $$x $(DESTDIR)$(includedir)/$$i" ;\ + $(INSTALL_DATA) $$x $(DESTDIR)$(includedir)/$$i ; done - $(MKINSTALLDIRS) $(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @for i in $(lib_LIBRARIES); do \ - echo "$(INSTALL) -m 0555 $$i $(libdir)" ;\ - $(INSTALL) -m 0555 $$i $(libdir) ; done + echo "$(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i" ;\ + $(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)" ;\ - $(INSTALL) -m 0555 $$i $(bindir) ; done + echo "$(INSTALL) -m 0555 $$i $(DESTDIR)$(bindir)/$$i" ;\ + $(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 diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index fab55d954..95751ca6d 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -74,17 +74,17 @@ des_enc.o: des_enc.c fi install: all - $(MKINSTALLDIRS) $(libdir) - $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) - $(MKINSTALLDIRS) $(bindir) + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) + $(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB) + $(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 diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in index c8700c708..f148116ed 100644 --- a/lib/editline/Makefile.in +++ b/lib/editline/Makefile.in @@ -43,11 +43,11 @@ Wall: $(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $< install: all - $(MKINSTALLDIRS) $(libdir) - $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(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 diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index ba82fc79f..a3e24409a 100644 --- a/lib/kafs/Makefile.in +++ b/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)" ;\ - $(INSTALL) -m 0555 $$i $(libdir) ; done + echo "$(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i" ;\ + $(INSTALL) -m 0555 $$i $(DESTDIR)$(libdir)/$$i ; done uninstall: @for i in $(LIB); do \ - echo "rm -f $(libdir)/$$i" ;\ - rm -f $(libdir)/$$i ; done + echo "rm -f $(DESTDIR)$(libdir)/$$i" ;\ + 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 diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index 358bcd78d..ffcc568d3 100644 --- a/lib/otp/Makefile.in +++ b/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) - $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(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 diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in index 61e64f7ac..035ac8fff 100644 --- a/lib/roken/Makefile.in +++ b/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 diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in index 5ae164565..2fcda2a3b 100644 --- a/lib/sl/Makefile.in +++ b/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 - $(INSTALL_DATA) $(srcdir)/ss.h $(includedir)/ss - $(MKINSTALLDIRS) $(libdir) - $(INSTALL) -m 555 $(sl_LIB) $(libdir)/$(sl_LIB) - $(INSTALL) -m 555 $(sl_LIB) $(libdir)/$(ss_LIB) - $(MKINSTALLDIRS) $(bindir) - $(INSTALL) -m 0555 $(PROGS) $(bindir) + $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/ss + $(INSTALL_DATA) $(srcdir)/ss.h $(DESTDIR)$(includedir)/ss/ss.h + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) + $(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(sl_LIB) + $(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB) + $(MKINSTALLDIRS) $(DESTDIR)$(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