Thread: [Brlcad-commits] CVS: brlcad Makefile.am,14.10,14.11
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Sean M. <br...@us...> - 2005-03-01 07:41:36
|
Update of /cvsroot/brlcad/brlcad In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24818 Modified Files: Makefile.am Log Message: check for prefix and bindir initially for invalid permissions; create an install timestamp file that is used to warn the binary package makers if an install was never performed. Index: Makefile.am =================================================================== RCS file: /cvsroot/brlcad/brlcad/Makefile.am,v retrieving revision 14.10 retrieving revision 14.11 diff -w -u -r14.10 -r14.11 --- Makefile.am 23 Feb 2005 08:21:05 -0000 14.10 +++ Makefile.am 1 Mar 2005 07:41:25 -0000 14.11 @@ -69,6 +69,7 @@ config.log \ config.status \ configure \ + install.$(host_triplet) \ libtool \ so_locations @@ -82,6 +83,17 @@ $(PACKAGE)-$(VERSION).tar.gz: dist $(PACKAGE_NAME)-$(VERSION).pkg: + @if ! test -f "install.$(host_triplet)" ; then \ + $(ECHO) ; \ + $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \ + $(ECHO) " WARNING: It seems as though you might not have" ; \ + $(ECHO) " installed BRL-CAD yet?" ; \ + $(ECHO) ; \ + $(ECHO) " You should run 'make install' before creating a" ; \ + $(ECHO) " binary distribution package. Trying regardless." ; \ + $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \ + $(ECHO) ; \ + fi @$(ECHO) "Building an Installer package for Mac OS X" @$(ECHO) @$(ECHO) "Warning: this package target presently assumes that the install directory" @@ -89,7 +101,7 @@ @$(ECHO) @@SH@ sh/make_pkg.sh "$(PACKAGE_NAME)" "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_VERSION)" "$(DESTDIR)$(prefix)" -$(PACKAGE_NAME)-$(VERSION).dmg: +$(PACKAGE_NAME)-$(VERSION).dmg: $(PACKAGE_NAME)-$(VERSION).pkg @$(ECHO) "Building a Disk Image for Mac OS X" @$(ECHO) @@SH@ sh/make_dmg.sh "$(PACKAGE_NAME)-$(VERSION)" @@ -121,6 +133,17 @@ @@SH@ sh/make_deb.sh "$(PACKAGE_NAME)-$(VERSION)" $(PACKAGE)-$(VERSION).bin.zip: + @if ! test -f "install.$(host_triplet)" ; then \ + $(ECHO) ; \ + $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \ + $(ECHO) " WARNING: It seems as though you might not have" ; \ + $(ECHO) " installed BRL-CAD yet?" ; \ + $(ECHO) ; \ + $(ECHO) " You should run 'make install' before creating a" ; \ + $(ECHO) " binary distribution package. Trying regardless." ; \ + $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \ + $(ECHO) ; \ + fi @$(ECHO) "Building a zip-compressed file archive" @$(ECHO) @@SH@ sh/make_zip.sh "$(PACKAGE_NAME)-$(VERSION)" @@ -142,6 +165,17 @@ @$(ECHO) "Built $(PACKAGE_NAME)-$(VERSION).bin.tar.bz2 for $(host_triplet)" $(PACKAGE)-$(VERSION).bin.tar: + @if ! test -f "install.$(host_triplet)" ; then \ + $(ECHO) ; \ + $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \ + $(ECHO) " WARNING: It seems as though you might not have" ; \ + $(ECHO) " installed BRL-CAD yet?" ; \ + $(ECHO) ; \ + $(ECHO) " You should run 'make install' before creating a" ; \ + $(ECHO) " binary distribution package. Trying regardless." ; \ + $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \ + $(ECHO) ; \ + fi @$(ECHO) "Building an uncompressed tape archive" @$(ECHO) @@SH@ sh/make_tar.sh "$(PACKAGE_NAME)" "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_VERSION)" "$(DESTDIR)$(prefix)" @@ -206,13 +240,21 @@ # make sure a dangerous umask will not prevent others from using an # installed version by checking to make sure the exec mode is set. +# We minimally check only the binary and prefix directories. install-data-local: @warn_umask=no ; \ + case `ls -ld $(DESTDIR)$(prefix)` in \ + d????????-*) warn_umask=yes ;; \ + d?????-???*) warn_umask=yes ;; \ + d??-??????*) warn_umask=yes ;; \ + esac ; \ + if test "x$$warn_umask" = "xno" ; then \ case `ls -ld $(DESTDIR)$(bindir)` in \ d????????-*) warn_umask=yes ;; \ d?????-???*) warn_umask=yes ;; \ d??-??????*) warn_umask=yes ;; \ esac ; \ + fi ; \ if test "x$$warn_umask" = "xyes" ; then \ $(ECHO) ; \ $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \ @@ -265,9 +307,12 @@ fi ; \ fi ; \ $(ECHO) ; \ + $(ECHO) " Do not presume the find example is all that is" ; \ + $(ECHO) " needed. VERIFY THE PERMISSIONS." ; \ $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \ $(ECHO) ; \ - fi + fi ; \ + touch install.$(host_triplet) # Print out an informative summary. As just about everything seems to |