git » libfiu » commit 7b96b64

Allow the user to override the "install" command

author Alberto Bertogli
2009-07-03 00:03:06 UTC
committer Alberto Bertogli
2009-07-03 00:06:37 UTC
parent 6007206f689843f32a5e3d0f3c96c5a9da9bb3f3
Allow the user to override the "install" command

It's useful in Solaris where the default install is not compatible with
the GNU or BSD install.

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
README +3 -0
libfiu/Makefile +14 -11
preload/posix/Makefile +6 -2
preload/run/Makefile +9 -6
utils/Makefile +7 -4 
diff --git a/README b/README
index 312e4ed..7dc7bd4 100644
--- a/README
+++ b/README
@@ -35,6 +35,9 @@ To build the Python bindings, use "make python2"; to install them you can run
 "make python3_install".
 
 
+Solaris users must use "gmake INSTALL=ginstall" instead of "make".
+
+
 Where to report bugs
 --------------------
 
diff --git a/libfiu/Makefile b/libfiu/Makefile
index 425056c..5231d62 100644
--- a/libfiu/Makefile
+++ b/libfiu/Makefile
@@ -14,6 +14,9 @@ endif
 # prefix for installing the binaries
 PREFIX=/usr/local
 
+# install utility, we assume it's GNU/BSD compatible
+INSTALL=install
+
 
 OBJS = fiu.o fiu-rc.o
 
@@ -45,22 +48,22 @@ libfiu.a: fiu.h $(OBJS)
 
 
 install-lib: libs libfiu.pc
-	install -d $(PREFIX)/lib
-	install -m 0755 libfiu.so $(PREFIX)/lib
-	install -m 0755 libfiu.a $(PREFIX)/lib
-	install -d $(PREFIX)/include
-	install -m 0644 fiu.h $(PREFIX)/include
-	install -m 0644 fiu-control.h $(PREFIX)/include
-	install -m 0644 fiu-local.h $(PREFIX)/include
-	install -d $(PREFIX)/lib/pkgconfig
-	install -m 644 libfiu.pc $(PREFIX)/lib/pkgconfig
+	$(INSTALL) -d $(PREFIX)/lib
+	$(INSTALL) -m 0755 libfiu.so $(PREFIX)/lib
+	$(INSTALL) -m 0755 libfiu.a $(PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)/include
+	$(INSTALL) -m 0644 fiu.h $(PREFIX)/include
+	$(INSTALL) -m 0644 fiu-control.h $(PREFIX)/include
+	$(INSTALL) -m 0644 fiu-local.h $(PREFIX)/include
+	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
+	$(INSTALL) -m 644 libfiu.pc $(PREFIX)/lib/pkgconfig
 	@echo
 	@echo "Please run ldconfig to update your library cache"
 	@echo
 
 install-man:
-	install -d $(PREFIX)/man/man3
-	install -m 0644 libfiu.3 $(PREFIX)/man/man3/
+	$(INSTALL) -d $(PREFIX)/man/man3
+	$(INSTALL) -m 0644 libfiu.3 $(PREFIX)/man/man3/
 
 install: install-lib install-man
 
diff --git a/preload/posix/Makefile b/preload/posix/Makefile
index e470e70..34664e2 100644
--- a/preload/posix/Makefile
+++ b/preload/posix/Makefile
@@ -14,6 +14,10 @@ endif
 # prefix for installing the binaries
 PREFIX=/usr/local
 
+# install utility, we assume it's GNU/BSD compatible
+INSTALL=install
+
+
 MODS = $(wildcard modules/*.mod)
 GEN_C = $(addsuffix .c,$(MODS))
 GEN_OBJS = $(addsuffix .o,$(MODS))
@@ -60,8 +64,8 @@ function_list: $(GEN_FL) function_list.skel
 	$(Q) for i in $(GEN_FL); do cat $$i >> function_list; done
 
 install: fiu_posix_preload.so
-	install -d $(PREFIX)/lib
-	install -m 0755 fiu_posix_preload.so $(PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)/lib
+	$(INSTALL) -m 0755 fiu_posix_preload.so $(PREFIX)/lib
 
 clean:
 	rm -f $(OBJS) $(GEN_OBJS:.o=.c) $(GEN_FL)
diff --git a/preload/run/Makefile b/preload/run/Makefile
index cb11220..1cc160d 100644
--- a/preload/run/Makefile
+++ b/preload/run/Makefile
@@ -14,6 +14,9 @@ endif
 # prefix for installing the binaries
 PREFIX=/usr/local
 
+# install utility, we assume it's GNU/BSD compatible
+INSTALL=install
+
 
 OBJS = run.o
 
@@ -41,12 +44,12 @@ fiu-run: fiu-run.in
 	chmod +x fiu-run
 
 install: fiu_run_preload.so fiu-run
-	install -d $(PREFIX)/lib
-	install -m 0755 fiu_run_preload.so $(PREFIX)/lib
-	install -d $(PREFIX)/bin
-	install -m 0755 fiu-run $(PREFIX)/bin
-	install -d $(PREFIX)/man/man1
-	install -m 0644 fiu-run.1 $(PREFIX)/man/man1/
+	$(INSTALL) -d $(PREFIX)/lib
+	$(INSTALL) -m 0755 fiu_run_preload.so $(PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)/bin
+	$(INSTALL) -m 0755 fiu-run $(PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)/man/man1
+	$(INSTALL) -m 0644 fiu-run.1 $(PREFIX)/man/man1/
 
 clean:
 	rm -f $(OBJS) fiu_run_preload.so fiu-run
diff --git a/utils/Makefile b/utils/Makefile
index a0ac66e..573efba 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -2,14 +2,17 @@
 # prefix for installing the binaries
 PREFIX=/usr/local
 
+# install utility, we assume it's GNU/BSD compatible
+INSTALL=install
+
 
 default:
 	
 install:
-	install -d $(PREFIX)/bin
-	install -m 0755 fiu-ctrl $(PREFIX)/bin
-	install -d $(PREFIX)/man/man1
-	install -m 0644 fiu-ctrl.1 $(PREFIX)/man/man1/
+	$(INSTALL) -d $(PREFIX)/bin
+	$(INSTALL) -m 0755 fiu-ctrl $(PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)/man/man1
+	$(INSTALL) -m 0644 fiu-ctrl.1 $(PREFIX)/man/man1/
 
 clean: