From 25dd3496fe02e40ded47791a9c8eec2ced96dce0 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 9 Jan 1997 16:46:11 +0000 Subject: [PATCH] Use @foo_prefix@ and @program_transform_name@ Add code to uninstall target git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1152 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/Makefile.in | 15 +++++++++++---- appl/ftp/ftpd/Makefile.in | 14 ++++++++++---- appl/kx/Makefile.in | 23 +++++++++++++++++------ appl/otp/Makefile.in | 24 +++++++++++++++++------- appl/popper/Makefile.in | 14 ++++++++++---- appl/telnet/telnet/Makefile.in | 15 +++++++++++---- appl/telnet/telnetd/Makefile.in | 17 ++++++++++++----- appl/xnlock/Makefile.in | 24 +++++++++++++++++------- lib/des/Makefile.in | 16 ++++++++++++---- 9 files changed, 117 insertions(+), 45 deletions(-) diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in index 0b38271ec..9cf637f3e 100644 --- a/appl/ftp/ftp/Makefile.in +++ b/appl/ftp/ftp/Makefile.in @@ -19,8 +19,8 @@ MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +bindir = @bindir@ +transform=@program_transform_name@ ATHENA = ../../.. @@ -45,8 +45,15 @@ all: $(PROGS) $(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $< install: all - $(MKINSTALLDIRS) $(prefix)/bin - for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done + $(MKINSTALLDIRS) $(bindir) + for x in $(PROGS); do \ + $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + +uninstall: + for x in $(PROGS); do \ + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done ftp: $(ftp_OBJS) # ../common/libcommon.a $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS) -L$(LIBTOP)/roken -lroken diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in index 8a1cde68b..2cf6d0f0b 100644 --- a/appl/ftp/ftpd/Makefile.in +++ b/appl/ftp/ftpd/Makefile.in @@ -22,8 +22,8 @@ MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +exec_prefix = @exec_prefix@ +libexecdir = @libexecdir@ ATHENA = ../../.. @@ -51,9 +51,15 @@ all: ftpd $(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $< install: all - $(MKINSTALLDIRS) $(prefix)/libexec - for x in $(PROGS); do $(INSTALL) $$x $(prefix)/libexec; done + $(MKINSTALLDIRS) $(libexecdir) + for x in $(PROGS); do \ + $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done +uninstall: + for x in $(PROGS); do \ + rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done ftpd: $(ftpd_OBJS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS) $(LIBROKEN) diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in index 48f293a07..b1c551bfc 100644 --- a/appl/kx/Makefile.in +++ b/appl/kx/Makefile.in @@ -18,10 +18,11 @@ LIBS = $(XLIBS) @LIBS@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib -libexecdir = $(exec_prefix)/libexec -bindir = $(exec_prefix)/bin +exec_prefix = @exec_prefix@ +libdir = @libdir@ +libexecdir = @libexecdir@ +bindir = @bindir@ +transform=@program_transform_name@ X_PROGS_BIN = kx rxterm rxtelnet X_PROGS_LIBEXEC = kxd @@ -50,10 +51,20 @@ Wall: install: all $(MKINSTALLDIRS) $(bindir) - for x in $(PROG_BIN); do $(INSTALL) $$x $(bindir); done - for x in $(PROG_LIBEXEC); do $(INSTALL) $$x $(libexecdir); done + for x in $(PROG_BIN); do \ + $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + for x in $(PROG_LIBEXEC); do \ + $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done uninstall: + for x in $(PROG_BIN); do \ + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + for x in $(PROG_LIBEXEC); do \ + rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done TAGS: $(SOURCES) etags $(SOURCES) diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in index 2b8ff1fb7..d2748a319 100644 --- a/appl/otp/Makefile.in +++ b/appl/otp/Makefile.in @@ -16,10 +16,11 @@ LIBS = @LIBS@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib -libexecdir = $(exec_prefix)/libexec -bindir = $(exec_prefix)/bin +exec_prefix = @exec_prefix@ +libdir = @libdir@ +libexecdir = @libexecdir@ +bindir = @bindir@ +transform=@program_transform_name@ PROG_SUIDBIN = otp PROG_BIN = otpprint @@ -41,11 +42,20 @@ all: $(PROGS) install: all $(MKINSTALLDIRS) $(bindir) - for x in $(PROG_BIN); do $(INSTALL) $$x $(bindir); done - -for x in $(PROG_SUIDBIN);\ - do $(INSTALL) -o root -m 04555 $$x $(bindir); done + for x in $(PROG_BIN); do \ + $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + -for x in $(PROG_SUIDBIN); do \ + $(INSTALL) -o root -m 04555 $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done uninstall: + for x in $(PROG_BIN); do \ + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + for x in $(PROG_SUIDBIN); do \ + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done TAGS: $(SOURCES) etags $(SOURCES) diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in index 5e814a81e..e8e04e24b 100644 --- a/appl/popper/Makefile.in +++ b/appl/popper/Makefile.in @@ -16,9 +16,10 @@ LIBS = @LIBS@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib -bindir = $(exec_prefix)/bin +exec_prefix = @exec_prefix@ +libdir = @libdir@ +bindir = @bindir@ +transform=@program_transform_name@ PROG_BIN = PROG_LIBEXEC = popper @@ -50,9 +51,14 @@ Wall: install: all $(MKINSTALLDIRS) $(bindir) - for x in $(PROG_LIBEXEC); do $(INSTALL) $$x $(prefix)/libexec; done + for x in $(PROG_LIBEXEC); do \ + $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done uninstall: + for x in $(PROG_LIBEXEC); do \ + rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done TAGS: $(SOURCES) etags $(SOURCES) diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in index e5bb6207f..2b2a8ca73 100644 --- a/appl/telnet/telnet/Makefile.in +++ b/appl/telnet/telnet/Makefile.in @@ -19,8 +19,8 @@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs PROGS = telnet prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +bindir = @bindir@ +transform=@program_transform_name@ SOURCES=authenc.c commands.c main.c network.c ring.c \ sys_bsd.c telnet.c terminal.c \ @@ -47,8 +47,15 @@ telnet: $(OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ @LIB_setupterm@ $(LIBROKEN) install: all - $(MKINSTALLDIRS) $(prefix)/bin - for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done + $(MKINSTALLDIRS) $(bindir) + for x in $(PROGS); do \ + $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + +uninstall: + for x in $(PROGS); do \ + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done TAGS: $(SOURCES) etags $(SOURCES) diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index f4e92da4d..1565a0d4b 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/appl/telnet/telnetd/Makefile.in @@ -19,9 +19,9 @@ INSTALL = @INSTALL@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib -bindir = $(exec_prefix)/bin +exec_prefix = @exec_prefix@ +libexecdir = @libexecdir@ +transform=@program_transform_name@ PROGS = telnetd @@ -50,8 +50,15 @@ telnetd: $(OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN) install: all - $(MKINSTALLDIRS) $(prefix)/libexec - for x in $(PROGS); do $(INSTALL) $$x $(prefix)/libexec; done + $(MKINSTALLDIRS) $(libexecdir) + for x in $(PROGS); do \ + $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done + +uninstall: + for x in $(PROGS); do \ + rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + done TAGS: $(SOURCES) etags $(SOURCES) diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in index 6e7f8a8ae..5b554833d 100644 --- a/appl/xnlock/Makefile.in +++ b/appl/xnlock/Makefile.in @@ -21,9 +21,11 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib -bindir = $(exec_prefix)/bin +exec_prefix = @exec_prefix@ +libdir = @libdir@ +bindir = @bindir@ +mandir = @mandir@ +transform=@program_transform_name@ X_PROGS_BIN = xnlock @@ -47,14 +49,22 @@ Wall: install: all $(MKINSTALLDIRS) $(bindir) - for x in $(PROG_BIN); do $(INSTALL) $$x $(bindir); done - $(MKINSTALLDIRS) $(prefix)/man/man1 + for x in $(PROG_BIN); do + $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + $(MKINSTALLDIRS) $(mandir)/man1 (cd $(srcdir); \ for x in $(MAN1); do \ - $(INSTALL_DATA) $$x $(prefix)/man/man1/`echo $$x | sed 's/\.man/.1/'`; \ + $(INSTALL_DATA) $$x $(mandir)/man1/`echo $$x | echo $(transform) | sed 's/\.man/.1/'`; \ done) - +n uninstall: + for x in $(PROG_BIN); do + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done + for x in $(MAN1); do \ + rm -f $(mandir)/man1/`echo $$x | echo $(transform) | sed 's/\.man/.1/'`; \ + done TAGS: $(SOURCES) etags $(SOURCES) diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index 8d40b6b05..9f9332cff 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -19,8 +19,10 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +transform=@program_transform_name@ PICFLAGS = @PICFLAGS@ @@ -65,10 +67,16 @@ mdtest.o: mdtest.c install: all $(MKINSTALLDIRS) $(libdir) $(INSTALL) -m 0555 $(LIB) $(libdir) - $(MKINSTALLDIRS) $(prefix)/bin - for x in $(PROGS2INSTALL); do $(INSTALL) $$x $(prefix)/bin; done + $(MKINSTALLDIRS) $(bindir) + for x in $(PROGS2INSTALL); do \ + $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + done uninstall: + rm -f $(libdir)/$(LIB) + for x in $(PROGS2INSTALL); do \ + rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ + done TAGS: $(LIBSRC) etags $(LIBSRC)