[svnbook commit] r2071 - trunk/src/tools

[maxb]

Author: maxb
Date: Wed Mar 15 09:41:07 2006
New Revision: 2071

Modified:
   trunk/src/tools/Makefile.base-rules
   trunk/src/tools/Makefile.base-vars

Log:
Stop setting execute permission on installed documentation files.

* src/tools/Makefile.base-vars (INSTALL): Remove, replacing with...
  (INSTALL_DATA, MKDIR): ...these more specific variants.

* src/tools/Makefile.base-rules: Throughout, use new command variables.


Modified: trunk/src/tools/Makefile.base-rules
==============================================================================
--- trunk/src/tools/Makefile.base-rules	(original)
+++ trunk/src/tools/Makefile.base-rules	Wed Mar 15 09:41:07 2006
@@ -55,25 +55,25 @@
 
 # Install targets
 $(INSTALL_SUBDIR):
-	$(INSTALL) -d $(INSTALL_SUBDIR)
+	$(MKDIR) $(INSTALL_SUBDIR)
 
 install-html: $(HTML_TARGET) $(INSTALL_SUBDIR)
-	$(IFIMAGES) $(INSTALL) -d $(INSTALL_SUBDIR)/images $(ENDIF)
-	$(INSTALL) $(HTML_TARGET) $(INSTALL_SUBDIR)
-	$(INSTALL) $(STYLESHEET) $(INSTALL_SUBDIR)
-	$(IFIMAGES) $(INSTALL) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
+	$(IFIMAGES) $(MKDIR) $(INSTALL_SUBDIR)/images $(ENDIF)
+	$(INSTALL_DATA) $(HTML_TARGET) $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) $(STYLESHEET) $(INSTALL_SUBDIR)
+	$(IFIMAGES) $(INSTALL_DATA) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
 
 install-html-chunk: $(HTML_CHUNK_TARGET) $(INSTALL_SUBDIR)
-	$(IFIMAGES) $(INSTALL) -d $(INSTALL_SUBDIR)/images $(ENDIF)
-	$(INSTALL) $(HTML_CHUNK_DIR)/*.html $(INSTALL_SUBDIR)
-	$(INSTALL) $(STYLESHEET) $(INSTALL_SUBDIR)
-	$(IFIMAGES) $(INSTALL) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
+	$(IFIMAGES) $(MKDIR) $(INSTALL_SUBDIR)/images $(ENDIF)
+	$(INSTALL_DATA) $(HTML_CHUNK_DIR)/*.html $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) $(STYLESHEET) $(INSTALL_SUBDIR)
+	$(IFIMAGES) $(INSTALL_DATA) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
 
 install-pdf: $(PDF_TARGET) $(INSTALL_SUBDIR)
-	$(INSTALL) $(PDF_TARGET) $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) $(PDF_TARGET) $(INSTALL_SUBDIR)
 
 install-ps: $(PS_TARGET) $(INSTALL_SUBDIR)
-	$(INSTALL) $(PS_TARGET) $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) $(PS_TARGET) $(INSTALL_SUBDIR)
 
 # Clean targets
 clean:

Modified: trunk/src/tools/Makefile.base-vars
==============================================================================
--- trunk/src/tools/Makefile.base-vars	(original)
+++ trunk/src/tools/Makefile.base-vars	Wed Mar 15 09:41:07 2006
@@ -25,7 +25,8 @@
 XSLTPROC = xsltproc
 XMLLINT = xmllint
 INSTALL_DIR = $(DESTDIR)/usr/share/doc/OVERRIDE_ME_WITH_SOMETHING_SUITABLE
-INSTALL = install
+INSTALL_DATA = install -m 644
+MKDIR = install -d
 SVNVERSION = svnversion
 
 # You should not normally need to edit anything below here.