rse 98/07/25 04:56:31
Modified: src CHANGES
. Makefile.tmpl
Log:
Fix `install-includes' sub-target of `install' target in top-level
Makefile.tmpl: The umask+cp approach didn't work as expected (especially for
users which extracted the distribution under 'umask 077'), so replace it by an
explicit cp+chmod approach.
Submitted by: Richard Lloyd, Curt Sampson
Reviewed and fixed by: Ralf S. Engelschall
PR: 2656, 2626
Revision Changes Path
1.985 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- CHANGES 1998/07/25 11:30:17 1.984
+++ CHANGES 1998/07/25 11:56:28 1.985
@@ -1,4 +1,10 @@
Changes with Apache 1.3.2
+
+ *) Fix `install-includes' sub-target of `install' target in top-level
+ Makefile.tmpl: The umask+cp approach didn't work as expected (especially
+ for users which extracted the distribution under 'umask 077'), so
replace
+ it by an explicit cp+chmod approach.
+ [Richard Lloyd, Curt Sampson, Ralf S. Engelschall] PR#2656 PR#2626
*) Fix `distclean' and `clean' targets in src/Makefile.tmpl to have same
behavior and to cleanup correctly even under enabled SHARED_CORE rule.
1.43 +4 -4 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.tmpl 1998/07/15 17:03:25 1.42
+++ Makefile.tmpl 1998/07/25 11:56:30 1.43
@@ -80,7 +80,6 @@
LN = ln
RM = rm -f
TAR = tar
-UMASK = umask
MKDIR = $(TOP)/$(AUX)/mkdir.sh
INSTALL = $(TOP)/$(AUX)/install.sh -c
INSTALL_PROGRAM = $(INSTALL) -s -m 755
@@ -328,10 +327,11 @@
# install the Apache C header files
install-include:
@echo "===> [include: Installing Apache C header files]"
- $(UMASK) 022; $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
+ $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e
's:^OSDIR=.*/os:os:'`; \
- echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/"; \
- $(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
+ echo "$(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/"; \
+ $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
+ chmod 644 $(root)$(includedir)/*.h
@echo "<=== [include]"
# create an initial document root containing the Apache manual,
