Author: peters
Date: Sun Jun 26 20:39:22 2011
New Revision: 1139937
URL: http://svn.apache.org/viewvc?rev=1139937&view=rev
Log:
* tools/dev/unix-build/Makefile.svn
($(PREFIX)/httpd/conf/httpd-$(SVN_REL_WC).conf): Rename target to
$(HTTPD_CONF), for clarity.
($(GNU_ICONV_OBJDIR)/lib_encodings.def.diff,
$(GNU_ICONV_OBJDIR)/lib_aliases.gperf.diff),
$(HTTPD_CONF), $(HTTPD_CHECK_USERS), $(HTTPD_CHECK_CONF)):
Simplify the mkdir -p, a harmless no-op if a dir already exists.
Move the >>$@ to the front of each echo, for improved readability.
Use '' in place of "" for less quoting / interpolation.
Create [email protected], then mv -f [email protected] $@, so that if you happen to
interrupt one of those targets halfway through, 'make' will
correctly regenerate the target next time.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1139937&r1=1139936&r2=1139937&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Jun 26 20:39:22 2011
@@ -366,30 +366,32 @@ $(DISTDIR)/$(GNU_ICONV_DIST):
cd $(DISTDIR) && $(FETCH_CMD) $(GNU_ICONV_URL)
$(GNU_ICONV_OBJDIR)/lib_encodings.def.diff:
- [ -d $(GNU_ICONV_OBJDIR) ] || mkdir -p $(GNU_ICONV_OBJDIR)
- echo "--- lib/encodings.def.orig Wed Oct 24 23:41:41 2007" > $@
- echo "+++ lib/encodings.def Wed Oct 24 23:43:47 2007" >> $@
- echo "@@ -37,6 +37,7 @@" >> $@
- echo " " >> $@
- echo " " >> $@
- echo " DEFENCODING(( \"US-ASCII\", /* IANA */" >> $@
- echo "+ \"646\"," >> $@
- echo " \"ASCII\", /* IANA, JDK 1.1 */"
>> $@
- echo " \"ISO646-US\", /* IANA */" >> $@
- echo " \"ISO_646.IRV:1991\", /* IANA */" >> $@
+ mkdir -p $(dirname $@)
+ echo > [email protected] '--- lib/encodings.def.orig Wed Oct 24 23:41:41
2007'
+ echo >>[email protected] '+++ lib/encodings.def Wed Oct 24 23:43:47 2007'
+ echo >>[email protected] '@@ -37,6 +37,7 @@'
+ echo >>[email protected] ' '
+ echo >>[email protected] ' '
+ echo >>[email protected] ' DEFENCODING(( "US-ASCII", /* IANA */'
+ echo >>[email protected] '+ "646",'
+ echo >>[email protected] ' "ASCII", /* IANA, JDK
1.1 */'
+ echo >>[email protected] ' "ISO646-US", /* IANA */'
+ echo >>[email protected] ' "ISO_646.IRV:1991", /* IANA */'
+ mv [email protected] $@
$(GNU_ICONV_OBJDIR)/lib_aliases.gperf.diff:
- [ -d $(GNU_ICONV_OBJDIR) ] || mkdir -p $(GNU_ICONV_OBJDIR)
- echo "--- lib/aliases.gperf.orig Wed Oct 24 23:41:32 2007" > $@
- echo "+++ lib/aliases.gperf Wed Oct 24 23:47:38 2007" >> $@
- echo "@@ -10,6 +10,7 @@ struct alias { int name; unsigned int
encoding_index; " >> $@
- echo " %pic" >> $@
- echo " %%" >> $@
- echo " US-ASCII, ei_ascii" >> $@
- echo "+646, ei_ascii" >> $@
- echo " ASCII, ei_ascii" >> $@
- echo " ISO646-US, ei_ascii" >> $@
- echo " ISO_646.IRV:1991, ei_ascii" >> $@
+ mkdir -p $(dirname $@)
+ echo > [email protected] '--- lib/aliases.gperf.orig Wed Oct 24 23:41:32
2007'
+ echo >>[email protected] '+++ lib/aliases.gperf Wed Oct 24 23:47:38 2007'
+ echo >>[email protected] '@@ -10,6 +10,7 @@ struct alias { int name; unsigned int
encoding_index; '
+ echo >>[email protected] ' %pic'
+ echo >>[email protected] ' %%'
+ echo >>[email protected] ' US-ASCII, ei_ascii'
+ echo >>[email protected] '+646, ei_ascii'
+ echo >>[email protected] ' ASCII, ei_ascii'
+ echo >>[email protected] ' ISO646-US, ei_ascii'
+ echo >>[email protected] ' ISO_646.IRV:1991, ei_ascii'
+ mv [email protected] $@
# retrieve gnu-iconv
# Add 646 as an alias for ASCII to fix prop_test 22 on OpenBSD
@@ -546,24 +548,26 @@ $(HTTPD_OBJDIR)/.installed: $(HTTPD_OBJD
touch $@
# create a httpd.conf for mod_dav_svn
-$(PREFIX)/httpd/conf/httpd-$(SVN_REL_WC).conf: $(HTTPD_OBJDIR)/.installed
- echo "# httpd config for use with mod_dav_svn" > $@
- echo "ServerRoot \"$(PREFIX)/httpd\"" >> $@
- echo "Listen localhost:8080" >> $@
- echo "LoadModule dav_svn_module modules/svn-$(WC)/mod_dav_svn.so" >> $@
- echo "LoadModule authz_svn_module modules/svn-$(WC)/mod_authz_svn.so"
>> $@
- echo "DocumentRoot "$(PREFIX)/httpd/htdocs"" >> $@
- echo "<Directory />" >> $@
- echo " Options FollowSymLinks" >> $@
- echo " AllowOverride None" >> $@
- echo " Order deny,allow" >> $@
- echo " Deny from all" >> $@
- echo "</Directory>" >> $@
- echo "<Location /repos>" >> $@
- echo " DAV svn" >> $@
- echo " SVNPath /tmp/svn-sandbox/repos" >> $@
- echo " Allow from localhost" >> $@
- echo "</Location>" >> $@
+$(HTTPD_CONF):
+ mkdir -p $(dirname $@)
+ echo >>[email protected] '# httpd config for use with mod_dav_svn'
+ echo >>[email protected] 'ServerRoot "$(PREFIX)/httpd"'
+ echo >>[email protected] 'Listen localhost:8080'
+ echo >>[email protected] 'LoadModule dav_svn_module
modules/svn-$(WC)/mod_dav_svn.so'
+ echo >>[email protected] 'LoadModule authz_svn_module
modules/svn-$(WC)/mod_authz_svn.so'
+ echo >>[email protected] 'DocumentRoot "$(PREFIX)/httpd/htdocs"'
+ echo >>[email protected] '<Directory />'
+ echo >>[email protected] ' Options FollowSymLinks'
+ echo >>[email protected] ' AllowOverride None'
+ echo >>[email protected] ' Order deny,allow'
+ echo >>[email protected] ' Deny from all'
+ echo >>[email protected] '</Directory>'
+ echo >>[email protected] '<Location /repos>'
+ echo >>[email protected] ' DAV svn'
+ echo >>[email protected] ' SVNPath /tmp/svn-sandbox/repos'
+ echo >>[email protected] ' Allow from localhost'
+ echo >>[email protected] '</Location>'
+ mv -f [email protected] $@
#######################################################################
# neon
@@ -1083,67 +1087,70 @@ HTTPD_CHECK_USERS=$(PREFIX)/httpd/conf/h
HTTPD_CHECK_PORT=8081
$(HTTPD_CHECK_USERS):
- echo "jrandom:xCGl35kV9oWCY" > $(HTTPD_CHECK_USERS)
- echo "jconstant:xCGl35kV9oWCY" >> $(HTTPD_CHECK_USERS)
+ mkdir -p $(dirname $@)
+ echo > [email protected] 'jrandom:xCGl35kV9oWCY'
+ echo >>[email protected] 'jconstant:xCGl35kV9oWCY'
+ mv -f [email protected] $@
$(HTTPD_CHECK_CONF): $(HTTPD_CHECK_USERS)
- echo "# httpd config for make check" > $(HTTPD_CHECK_CONF)
- echo "ServerRoot \"$(PREFIX)/httpd\"" >> $(HTTPD_CHECK_CONF)
- echo "Listen localhost:$(HTTPD_CHECK_PORT)" >> $(HTTPD_CHECK_CONF)
- echo "LoadModule dav_svn_module $(MOD_DAV_SVN)" >> $(HTTPD_CHECK_CONF)
- echo "LoadModule authz_svn_module $(MOD_AUTHZ_SVN)" >>
$(HTTPD_CHECK_CONF)
- echo "DocumentRoot "$(PREFIX)/httpd/htdocs"" >> $(HTTPD_CHECK_CONF)
- echo "# These two Locations are used for 'make check'" >>
$(HTTPD_CHECK_CONF)
- echo "<Directory />" >> $(HTTPD_CHECK_CONF)
- echo " Options FollowSymLinks" >> $(HTTPD_CHECK_CONF)
- echo " AllowOverride None" >> $(HTTPD_CHECK_CONF)
- echo " Order deny,allow" >> $(HTTPD_CHECK_CONF)
- echo " Allow from all" >> $(HTTPD_CHECK_CONF)
- echo "</Directory>" >> $(HTTPD_CHECK_CONF)
- echo "<Location /svn-test-work/repositories>" >> $(HTTPD_CHECK_CONF)
- echo " DAV svn" >> $(HTTPD_CHECK_CONF)
- echo " SVNParentPath
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/repositories" >>
$(HTTPD_CHECK_CONF)
- echo " AuthzSVNAccessFile
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/authz" >> $(HTTPD_CHECK_CONF)
- echo " AuthType Basic" >> $(HTTPD_CHECK_CONF)
- echo " AuthName \"Subversion Repository\"" >> $(HTTPD_CHECK_CONF)
- echo " AuthUserFile $(HTTPD_CHECK_USERS)" >> $(HTTPD_CHECK_CONF)
- echo " Require valid-user" >> $(HTTPD_CHECK_CONF)
+ echo > [email protected] '# httpd config for make check'
+ echo >>[email protected] 'ServerRoot "$(PREFIX)/httpd"'
+ echo >>[email protected] 'Listen localhost:$(HTTPD_CHECK_PORT)'
+ echo >>[email protected] 'LoadModule dav_svn_module $(MOD_DAV_SVN)'
+ echo >>[email protected] 'LoadModule authz_svn_module $(MOD_AUTHZ_SVN)'
+ echo >>[email protected] 'DocumentRoot "$(PREFIX)/httpd/htdocs"'
+ echo >>[email protected] '# These two Locations are used for "make check"'
+ echo >>[email protected] '<Directory />'
+ echo >>[email protected] ' Options FollowSymLinks'
+ echo >>[email protected] ' AllowOverride None'
+ echo >>[email protected] ' Order deny,allow'
+ echo >>[email protected] ' Allow from all'
+ echo >>[email protected] '</Directory>'
+ echo >>[email protected] '<Location /svn-test-work/repositories>'
+ echo >>[email protected] ' DAV svn'
+ echo >>[email protected] ' SVNParentPath
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/repositories'
+ echo >>[email protected] ' AuthzSVNAccessFile
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/authz'
+ echo >>[email protected] ' AuthType Basic'
+ echo >>[email protected] ' AuthName "Subversion Repository"'
+ echo >>[email protected] ' AuthUserFile $(HTTPD_CHECK_USERS)'
+ echo >>[email protected] ' Require valid-user'
ifeq ($(USE_HTTPV1),yes)
- echo " SVNAdvertiseV2Protocol off" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] ' SVNAdvertiseV2Protocol off'
endif
ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
- echo " SVNPathAuthz short_circuit" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] ' SVNPathAuthz short_circuit'
endif
- echo "</Location>" >> $(HTTPD_CHECK_CONF)
- echo "<Location /svn-test-work/local_tmp/repos>" >> $(HTTPD_CHECK_CONF)
- echo " DAV svn" >> $(HTTPD_CHECK_CONF)
- echo " SVNPath
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/local_tmp/repos" >>
$(HTTPD_CHECK_CONF)
- echo " AuthzSVNAccessFile
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/authz" >> $(HTTPD_CHECK_CONF)
- echo " AuthType Basic" >> $(HTTPD_CHECK_CONF)
- echo " AuthName \"Subversion Repository\"" >> $(HTTPD_CHECK_CONF)
- echo " AuthUserFile $(HTTPD_CHECK_USERS)" >> $(HTTPD_CHECK_CONF)
- echo " Require valid-user" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] '</Location>'
+ echo >>[email protected] '<Location /svn-test-work/local_tmp/repos>'
+ echo >>[email protected] ' DAV svn'
+ echo >>[email protected] ' SVNPath
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/local_tmp/repos'
+ echo >>[email protected] ' AuthzSVNAccessFile
$(SVN_WC)/subversion/tests/cmdline/svn-test-work/authz'
+ echo >>[email protected] ' AuthType Basic'
+ echo >>[email protected] ' AuthName "Subversion Repository"'
+ echo >>[email protected] ' AuthUserFile $(HTTPD_CHECK_USERS)'
+ echo >>[email protected] ' Require valid-user'
ifeq ($(USE_HTTPV1),yes)
- echo " SVNAdvertiseV2Protocol off" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] ' SVNAdvertiseV2Protocol off'
endif
ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
- echo " SVNPathAuthz short_circuit" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] ' SVNPathAuthz short_circuit'
endif
- echo "</Location>" >> $(HTTPD_CHECK_CONF)
- echo "# This Location lets you access repositories dropped in /tmp/" >>
$(HTTPD_CHECK_CONF)
- echo "<Location /svn>" >> $(HTTPD_CHECK_CONF)
- echo " DAV svn" >> $(HTTPD_CHECK_CONF)
- echo " SVNParentPath /tmp" >> $(HTTPD_CHECK_CONF)
- echo " Allow from all" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] '</Location>'
+ echo >>[email protected] '# This Location lets you access repositories dropped in
/tmp/'
+ echo >>[email protected] '<Location /svn>'
+ echo >>[email protected] ' DAV svn'
+ echo >>[email protected] ' SVNParentPath /tmp'
+ echo >>[email protected] ' Allow from all'
ifeq ($(USE_HTTPV1),yes)
- echo " SVNAdvertiseV2Protocol off" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] ' SVNAdvertiseV2Protocol off'
endif
ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
- echo " SVNPathAuthz short_circuit" >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] ' SVNPathAuthz short_circuit'
endif
- echo "</Location>" >> $(HTTPD_CHECK_CONF)
- echo 'RedirectMatch permanent
^/svn-test-work/repositories/REDIRECT-PERM-(.*)$$
/svn-test-work/repositories/$$1' >> $(HTTPD_CHECK_CONF)
- echo 'RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)$$
/svn-test-work/repositories/$$1' >> $(HTTPD_CHECK_CONF)
+ echo >>[email protected] '</Location>'
+ echo >>[email protected] 'RedirectMatch permanent
^/svn-test-work/repositories/REDIRECT-PERM-(.*)$$
/svn-test-work/repositories/$$1'
+ echo >>[email protected] 'RedirectMatch
^/svn-test-work/repositories/REDIRECT-TEMP-(.*)$$
/svn-test-work/repositories/$$1'
+ mv -f [email protected] $@
# We need this to make sure some targets below pick up the right libraries
LD_LIBRARY_PATH=$(PREFIX)/apr/lib:$(PREFIX)/iconv/lib:$(PREFIX)/bdb/lib:$(PREFIX)/neon/lib:$(PREFIX)/serf/lib:$(PREFIX)/sqlite/lib:$(PREFIX)/cyrus-sasl/lib:$(PREFIX)/iconv/lib:$(PREFIX)/libmagic/lib:$(PREFIX)/svn-$(WC)/lib
