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/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)