[project @ 1997-03-24 05:01:47 by sof]

2.02 fixes

1 files changed, 10 insertions, 9 deletions

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index c7415180d0..92438503da 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -82,6 +82,7 @@ version     = 2.02
 PERL        = @PerlCmd@
 RM          = rm -f
 MV          = mv
+CP          = cp -f
 LN_S        = @LN_S@
 CHMOD       = chmod
 INSTALL	    = @INSTALL@
@@ -137,7 +138,7 @@ config-pkgs ::
 	   echo $$"bindir='$(bindir)';"                                   >> bin/$(platform)/$(package)-$(version)/$$i; \
 	   echo $$"libdir='$(real_libdir)';"                              >> bin/$(platform)/$(package)-$(version)/$$i; \
 	   echo $$"datadir='$(real_datadir)';"                            >> bin/$(platform)/$(package)-$(version)/$$i; \
-	   cat bin/$(platform)/$(package)-$(version)/$(package).prl       >> bin/$(platform)/$(package)-$(version)/$$i; \
+	   cat bin/$(platform)/$(package)-$(version)/$$i.prl              >> bin/$(platform)/$(package)-$(version)/$$i; \
 	   $(CHMOD) $(BIN_PERMS) bin/$(platform)/$(package)-$(version)/$$i; \
 	   echo "Done."; \
 	done
@@ -166,10 +167,10 @@ in-place ::
 
 install-dirs ::
 	$(INSTALL_DIR) $(bindir)
-	(cd lib/$(platform)/$(package)-$(version); find . -type d -exec sh -c '$(INSTALL_DIR) $0 $(real_libdir)/$0' {} \; )
-	(cd share/$(package)-$(version); find . -type d -exec sh -c '$(INSTALL_DIR) $0 $(real_datadir)/$0' {} \; )
+	(cd lib/$(platform)/$(package)-$(version); find . -type d -exec sh -c '../../../$(INSTALL_DIR) $$0 $(real_libdir)/$$0' {} \; )
+	(cd share/$(package)-$(version); find . -type d -exec sh -c '../../$(INSTALL_DIR) $$0 $(real_datadir)/$$0' {} \; )
 
-install :: config-pkgs mk-version-symlinks install-dirs install-bin install-libs install-data
+install :: config-pkgs mk-version-symlinks install-dirs install-bin install-libs install-datas
 
 .PHONY: install-bin install-libs install-datas
 
@@ -177,18 +178,18 @@ install-bin:
 	for i in $(PACKAGE_BINS); do \
 	   $(INSTALL_BIN) bin/$(platform)/$(package)-$(version)/$$i $(bindir); \
 	done;
-	for in in $(VERSION_SYMLINKS_FOR) ""; do \
-	   if [ "x$$i" != "x"]; then \
-	   	$(INSTALL_BIN) bin/$(platform)/$(package)-$(version)/$$i $(bindir); \
+	for i in $(VERSION_SYMLINKS_FOR) ""; do \
+	   if [ "x$$i" != "x" ]; then \
+	   	( cd $(bindir); $(LN_S) $$i $$i-$(version) ); \
 	   fi; \
 	done
 
 
 install-libs:
-	(cd lib/$(platform)/$(package)-$(version); find . -type f -exec sh -c '$(INSTALL_LIB) $0 $(real_libdir)/$0' {} \; )
+	(cd lib/$(platform)/$(package)-$(version); find . -type f -exec sh -c '$(CP) $$0 $(real_libdir)/$$0' {} \; )
 
 install-datas:
-	(cd share/$(package)-$(version); find . -type f -exec sh -c '$(INSTALL_DATA) $0 $(real_datadir)/$0' {} \; )
+	(cd share/$(package)-$(version); find . -type f -exec sh -c '$(INSTALL_DATA) $$0 $(real_datadir)/$$0' {} \; )
 
 show-install-setup:
 	@echo "Install setup..."