From cfc4abfb41f4c555f1e6d640303a8636671868da Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Wed, 2 Oct 2002 16:38:14 +0000
Subject: [PATCH] Use BSD "install" to ensure that the required directories are
 created.

---
 src/Makefile.in     | 25 ++++++-------------------
 src/c/Makefile.in   |  2 +-
 src/doc/Makefile.in |  2 +-
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 86ba9dcee..f3ab32dbd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -73,33 +73,20 @@ libgmp.a:
 BUILD-STAMP: config.status
 	(echo "#"; uname -a) > $@
 	head -8 config.status | tail -6 >> $@
-directory:
-	test -d $(DIRECTORY) || (mkdir $(DIRECTORY); chmod 755 $(DIRECTORY))
 install: BUILD-STAMP
-	for i in $(TARGETS); do	\
-	  $(INSTALL_PROGRAM) $$i $(PREFIX)$(bindir); \
-	  strip $(PREFIX)$(bindir)/$$i; \
-	done
+	$(INSTALL) -d $(PREFIX)$(bindir) $(PREFIX)$(mandir) $(PREFIX)$(libdir)/h
+	$(INSTALL_PROGRAM) -s $(TARGETS) $(PREFIX)$(bindir)
 	$(INSTALL_DATA) $(srcdir)/etc/ecl.1 $(PREFIX)$(mandir)
-	$(MAKE) directory DIRECTORY=$(PREFIX)$(libdir)
-	$(MAKE) directory DIRECTORY=$(PREFIX)$(libdir)/h
-	$(INSTALL_DATA) BUILD-STAMP $(PREFIX)$(libdir)
+	$(INSTALL_DATA) BUILD-STAMP $(LSP_LIBRARIES) $(LIBRARIES) $(PREFIX)$(libdir)
 	$(INSTALL_DATA) h/config.h $(PREFIX)$(libdir)/h
-	for i in $(LSP_LIBRARIES) $(LIBRARIES); do \
-	  $(INSTALL_DATA) $$i $(PREFIX)$(libdir); \
-	done
 	$(INSTALL_DATA) help.doc $(PREFIX)$(libdir)
 	if (echo $(SUBDIR) | grep gc); then $(MAKE) installgc; fi
 	cd c; $(MAKE) PREFIX="$(PREFIX)" install
 	cd doc; $(MAKE) PREFIX="$(PREFIX)" install
 installgc:
-	$(MAKE) directory DIRECTORY=$(PREFIX)$(libdir)/h/private
-	for i in $(srcdir)/gc/include/*.h; do \
-	  $(INSTALL_DATA) $$i $(PREFIX)$(libdir)/h/; \
-	done
-	for i in $(srcdir)/gc/include/private/*.h; do \
-	  $(INSTALL_DATA) $$i $(PREFIX)$(libdir)/h/private/; \
-	done
+	$(INSTALL) -d $(PREFIX)$(libdir)/h/private
+	$(INSTALL_DATA) $(srcdir)/gc/include/*.h $(PREFIX)$(libdir)/h/
+	$(INSTALL_DATA) $(srcdir)/gc/include/private/*.h $(PREFIX)$(libdir)/h/private/
 
 uninstall:
 	rm -rf $(mandir)/ecl.1
diff --git a/src/c/Makefile.in b/src/c/Makefile.in
index b40f345e9..75df124a3 100644
--- a/src/c/Makefile.in
+++ b/src/c/Makefile.in
@@ -56,7 +56,7 @@ all:	$(DPP) ../libecl.a cinit.o
 .PHONY:	all
 
 install: $(HFILES)
-	for i in $(HFILES); do $(INSTALL_DATA) $$i $(PREFIX)$(libdir)/h; done
+	$(INSTALL_DATA) $(HFILES) $(PREFIX)$(libdir)/h/
 
 ../libecl.a: $(OBJS)
 	ar cr $@ $(OBJS)
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 5517afecc..2eae688cd 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -37,7 +37,7 @@ ecldev.ps: ecldev.dvi $(srcdir)/macros.txi
 	dvips -o $@ ecldev.dvi
 
 install: all
-	test -d $(PREFIX)$(infodir) || (mkdir $(PREFIX)$(infodir); chmod 755 $(PREFIX)$(infodir))
+	$(INSTALL) -d $(PREFIX)$(infodir)
 	$(INSTALL_DATA) ecl.info $(PREFIX)$(infodir)
 	$(INSTALL_DATA) ecldev.info $(PREFIX)$(infodir)