[GRASS-SVN] r30797 - in grass/trunk: general/g.mapsets gui/tcltk/d.m gui/wxpython lib/init macosx macosx/app raster/r.li/r.li.setup scripts/i.oif scripts/r.in.wms vector/v.clean/test

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Mar 29 12:23:30 EDT 2008


Author: glynn
Date: 2008-03-29 12:23:29 -0400 (Sat, 29 Mar 2008)
New Revision: 30797

Modified:
   grass/trunk/general/g.mapsets/Makefile
   grass/trunk/gui/tcltk/d.m/Makefile
   grass/trunk/gui/wxpython/Makefile
   grass/trunk/lib/init/Makefile
   grass/trunk/macosx/Makefile
   grass/trunk/macosx/app/Makefile
   grass/trunk/raster/r.li/r.li.setup/Makefile
   grass/trunk/scripts/i.oif/Makefile
   grass/trunk/scripts/r.in.wms/Makefile
   grass/trunk/vector/v.clean/test/Makefile
Log:
Remove hard-coded "-m 755" from $(INSTALL) commands



Modified: grass/trunk/general/g.mapsets/Makefile
===================================================================
--- grass/trunk/general/g.mapsets/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/general/g.mapsets/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -19,4 +19,4 @@
 
 $(GUI): g.mapsets.tcl
 	if [ ! -d $(GISBASE)/etc ]; then $(MKDIR) $(GISBASE)/etc; fi
-	$(INSTALL) -m 755 g.mapsets.tcl $(GUI)
+	$(INSTALL) g.mapsets.tcl $(GUI)

Modified: grass/trunk/gui/tcltk/d.m/Makefile
===================================================================
--- grass/trunk/gui/tcltk/d.m/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/gui/tcltk/d.m/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -18,7 +18,6 @@
 	for tcl in $(TCL); do \
 	    $(INSTALL) $$tcl $(ETC)/dm/ ; \
 	done
-	$(CHMOD) 755 $(ETC)/dm/tksys.tcl
-	$(INSTALL) -m 755 $(PGM2) $(PROG2)
+	$(INSTALL) $(PGM2) $(PROG2)
 	$(MKDIR) $(GISBASE)/etc/dm/script
-	$(INSTALL) -m 755 script/*.* $(GISBASE)/etc/dm/script
+	$(INSTALL) script/*.* $(GISBASE)/etc/dm/script

Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/gui/wxpython/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -23,7 +23,7 @@
 	$(INSTALL_DATA) icons/silk/* $(ETCDIR)/icons/silk/
 	$(INSTALL_DATA) images/* $(ETCDIR)/images/
 	$(INSTALL_DATA) gis_set.py wxgui.py README $(ETCDIR)/
-	$(INSTALL) -m 755 scripts/* $(ETCDIR)/scripts/	
-	$(INSTALL) -m 755 wxgui $(ETCDIR)/scripts/
+	$(INSTALL) scripts/* $(ETCDIR)/scripts/	
+	$(INSTALL) wxgui $(ETCDIR)/scripts/
 
 clean: cleansubdirs

Modified: grass/trunk/lib/init/Makefile
===================================================================
--- grass/trunk/lib/init/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/lib/init/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -182,15 +182,15 @@
 
 $(ETC)/gis_set.tcl: gis_set.tcl
 	rm -f $@
-	$(INSTALL) -m 755 gis_set.tcl $(ETC)
+	$(INSTALL) gis_set.tcl $(ETC)
 
 $(ETC)/epsg_option.tcl: epsg_option.tcl
 	rm -f $@
-	$(INSTALL) -m 755 epsg_option.tcl $(ETC)
+	$(INSTALL) epsg_option.tcl $(ETC)
 
 $(ETC)/file_option.tcl: file_option.tcl
 	rm -f $@
-	$(INSTALL) -m 755 file_option.tcl $(ETC)
+	$(INSTALL) file_option.tcl $(ETC)
 
 $(ETC)/grass-run.sh: grass-run.src
 	rm -f $@
@@ -203,15 +203,15 @@
 	$(INSTALL) grass-run.bat $(ETC)
 
 $(ETC)/grass-xterm-wrapper: grass-xterm-wrapper
-	$(INSTALL) -m 755 grass-xterm-wrapper $(ETC)
+	$(INSTALL) grass-xterm-wrapper $(ETC)
 
 $(ETC)/grass-xterm-mac: grass-xterm-mac
-	$(INSTALL) -m 755 grass-xterm-mac $(ETC)
+	$(INSTALL) grass-xterm-mac $(ETC)
 
 $(ETC)/prompt.sh: prompt.sh
 	rm -f $@
-	$(INSTALL) -m 755 prompt.sh $(ETC)
+	$(INSTALL) prompt.sh $(ETC)
 
 $(ETC)/html_browser_mac.sh: html_browser_mac.sh
-	$(INSTALL) -m 755 html_browser_mac.sh $(ETC)
+	$(INSTALL) html_browser_mac.sh $(ETC)
 

Modified: grass/trunk/macosx/Makefile
===================================================================
--- grass/trunk/macosx/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/macosx/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -10,7 +10,7 @@
 VER_MINOR_REL = `printf "%d0%d" ${GRASS_VERSION_MINOR} ${GRASS_VERSION_RELEASE}`
 VER_DATE = `date +"%g%m%d"`
 MAKE_DIR_CMD = mkdir -p -m 755
-INSTALL_BIN = ${INSTALL} -m 755
+INSTALL_BIN = ${INSTALL}
 LN = /bin/ln -sf
 LN_DIR = /bin/ln -sfh
 

Modified: grass/trunk/macosx/app/Makefile
===================================================================
--- grass/trunk/macosx/app/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/macosx/app/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -16,7 +16,7 @@
 TCLTK_INTERNAL = \#
 endif
 MAKE_DIR_CMD = mkdir -p -m 755
-INSTALL_BIN = ${INSTALL} -m 755
+INSTALL_BIN = ${INSTALL}
 GRASS_VERSION_BUILD = `/bin/date "+%y%m%d"`
 
 OBJS = Info.plist GRASS.scpt grass.sh main.o

Modified: grass/trunk/raster/r.li/r.li.setup/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/raster/r.li/r.li.setup/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -8,15 +8,15 @@
 
 default: script
 	$(MKDIR) $(TARGET)
-	$(INSTALL) -m 755 ./area_query $(TARGET)/area_query
-	$(INSTALL) -m 755 ./masked_area_selection $(TARGET)/masked_area_selection
-	$(INSTALL) -m 755 ./r.li.setup.main $(TARGET)/r.li.setup.main
-	$(INSTALL) -m 755 ./r.li.setup.procedures.tcl $(TARGET)/r.li.setup.procedures.tcl
-	$(INSTALL) -m 755 ./r.li.windows.tcl $(TARGET)/r.li.windows.tcl
-	$(INSTALL) -m 755 ./sample_area_vector.sh $(TARGET)/sample_area_vector.sh
-	$(INSTALL) -m 755 ./square_mouse_selection.sh $(TARGET)/square_mouse_selection.sh
-	$(INSTALL) -m 755 ./square_query $(TARGET)/square_query
-	$(INSTALL_DATA) ./circle.txt $(TARGET)/circle.txt
-	$(INSTALL_DATA) ./polygon.txt $(TARGET)/polygon.txt
+	$(INSTALL) area_query $(TARGET)/area_query
+	$(INSTALL) masked_area_selection $(TARGET)/masked_area_selection
+	$(INSTALL) r.li.setup.main $(TARGET)/r.li.setup.main
+	$(INSTALL) r.li.setup.procedures.tcl $(TARGET)/r.li.setup.procedures.tcl
+	$(INSTALL) r.li.windows.tcl $(TARGET)/r.li.windows.tcl
+	$(INSTALL) sample_area_vector.sh $(TARGET)/sample_area_vector.sh
+	$(INSTALL) square_mouse_selection.sh $(TARGET)/square_mouse_selection.sh
+	$(INSTALL) square_query $(TARGET)/square_query
+	$(INSTALL_DATA) circle.txt $(TARGET)/circle.txt
+	$(INSTALL_DATA) polygon.txt $(TARGET)/polygon.txt
 
 

Modified: grass/trunk/scripts/i.oif/Makefile
===================================================================
--- grass/trunk/scripts/i.oif/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/scripts/i.oif/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -6,4 +6,4 @@
 
 default: script
 	$(MKDIR) $(GISBASE)/etc/i.oif/
-	$(INSTALL) -m 755 i.oifcalc m.cutmatrix $(GISBASE)/etc/i.oif/
+	$(INSTALL) i.oifcalc m.cutmatrix $(GISBASE)/etc/i.oif/

Modified: grass/trunk/scripts/r.in.wms/Makefile
===================================================================
--- grass/trunk/scripts/r.in.wms/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/scripts/r.in.wms/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -6,4 +6,6 @@
 
 default: script
 	$(MKDIR) $(GISBASE)/etc/r.in.wms/
-	for file in r.in.gdalwarp wms.request wms.download ; do $(INSTALL) -m 755 $$file $(GISBASE)/etc/r.in.wms/ ; done
+	for file in r.in.gdalwarp wms.request wms.download ; do \
+		$(INSTALL) $$file $(GISBASE)/etc/r.in.wms/ ; \
+	done

Modified: grass/trunk/vector/v.clean/test/Makefile
===================================================================
--- grass/trunk/vector/v.clean/test/Makefile	2008-03-29 15:16:58 UTC (rev 30796)
+++ grass/trunk/vector/v.clean/test/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
@@ -15,9 +15,9 @@
 
 $(RPOLY): v.rand.poly
 	if [ ! -d $(GISBASE)/scripts ]; then $(MKDIR) $(GISBASE)/scripts; fi
-	$(INSTALL) -m 755 v.rand.poly $(RPOLY)
+	$(INSTALL) v.rand.poly $(RPOLY)
 
 $(CTEST): v.clean.test
 	if [ ! -d $(GISBASE)/scripts ]; then $(MKDIR) $(GISBASE)/scripts; fi
-	$(INSTALL) -m 755 v.clean.test $(CTEST)
+	$(INSTALL) v.clean.test $(CTEST)
 



More information about the grass-commit mailing list