Changeset 19036
- Timestamp:
- 2009-04-17T15:50:29+12:00 (15 years ago)
- Location:
- gsdl/trunk/runtime-src/packages
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/packages/Makefile.in
r18872 r19036 72 72 PACKAGEDIRS = $(YAZ) $(D2M) $(CORBA) $(HTTPD) 73 73 74 REPLACELIST = conf/extra/httpd-dav.conf \ 75 conf/extra/httpd-manual.conf \ 76 conf/extra/httpd-autoindex.conf \ 77 conf/extra/httpd-vhosts.conf \ 78 conf/extra/httpd-ssl.conf \ 79 conf/extra/httpd-multilang-errordoc.conf \ 80 conf/original/extra/httpd-dav.conf \ 81 conf/original/extra/httpd-manual.conf \ 82 conf/original/extra/httpd-autoindex.conf \ 83 conf/original/extra/httpd-vhosts.conf \ 84 conf/original/extra/httpd-ssl.conf \ 85 conf/original/extra/httpd-multilang-errordoc.conf \ 86 conf/original/httpd.conf\ 87 lib/apr-util-1/apr_dbd_odbc.la \ 88 lib/apr-util-1/apr_dbd_sqlite3.la \ 89 lib/pkgconfig/apr-util-1.pc \ 90 lib/pkgconfig/apr-1.pc \ 91 lib/libaprutil-1.la \ 92 lib/libapr-1.la \ 93 build/config_vars.mk \ 94 build/config.nice \ 95 build/apr_rules.mk \ 96 bin/apu-1-config \ 97 bin/apr-1-config \ 98 include/ap_config_auto.h \ 99 include/ap_config_layout.h 74 100 75 101 all: … … 133 159 chmod 755 ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \ 134 160 gsdldir=`cd ../.. ; pwd` ; \ 161 pre="$$gsdldir/apache-httpd/$(GSDLOS)" ; \ 135 162 for one_file in apachectl envvars envvars-std; do \ 136 sed -e "s%$$gsdldir/apache-httpd/$(GSDLOS)%*\*\APACHE_HOME_OS\*\*%" ../../apache-httpd/$(GSDLOS)/bin/$$one_file > ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ; \ 137 mv ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ../../apache-httpd/$(GSDLOS)/bin/$$one_file ; \ 138 done ; ) 163 sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" $$pre/bin/$$one_file > $$pre/bin/$$one_file.tmp ; \ 164 mv $$pre/bin/$$one_file.tmp $$pre/bin/$$one_file ; \ 165 done ; \ 166 for one_file in $(REPLACELIST); do \ 167 sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.tmp" ; \ 168 mv "$$pre/$$one_file.tmp" "$$pre/$$one_file" ; \ 169 done ; \ 170 cat "$$pre/bin/apr-1-config" \ 171 | sed -e "s%^APR_SOURCE_DIR=.*%APR_SOURCE_DIR=%" \ 172 | sed -e "s%^APR_BUILD_DIR=.*%APR_BUILD_DIR=%" \ 173 > "$$pre/bin/apr-1-config.tmp" ; \ 174 mv "$$pre/bin/apr-1-config.tmp" "$$pre/bin/apr-1-config" ; \ 175 cat "$$pre/bin/apu-1-config" \ 176 | sed -e "s%^APU_SOURCE_DIR=.*%APU_SOURCE_DIR=%" \ 177 | sed -e "s%^APU_BUILD_DIR=.*%APU_BUILD_DIR=%" \ 178 > "$$pre/bin/apu-1-config.tmp" ; \ 179 mv "$$pre/bin/apu-1-config.tmp" "$$pre/bin/apu-1-config" ; \ 180 sed -e "s%^EXTRA_INCLUDES\s*=.*%EXTRA_INCLUDES=%" "$$pre/build/config_vars.mk" > "$$pre/build/config_vars.mk.tmp" ; \ 181 mv "$$pre/build/config_vars.mk.tmp" "$$pre/build/config_vars.mk" ; ) -
gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh
r19018 r19036 74 74 75 75 # usually we're updating existing files, so need to copy them over into tmp files first 76 PRE=`grep "^prefix = " build/config_vars.mk`77 PRE=`echo $PRE | sed -e "s;prefix = ;;"`78 sed -e "s ;$PRE;\"$SR\";" build/config_vars.mk > "$SR/build/config_vars.mk.tmp"76 #PRE=`grep "^prefix = " build/config_vars.mk` 77 #PRE=`echo $PRE | sed -e "s;prefix = ;;"` 78 sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 79 79 mv "$SR/build/config_vars.mk.tmp" "$SR/build/config_vars.mk" 80 80 chmod u+rwx "$SR/build/config_vars.mk" … … 102 102 # Non-crucial files (replacements not essential) 103 103 # but replacing the occurrences of $PRE in them with $SR anyway: 104 cd "$currentdir/conf/extra/" 105 for one_file in httpd-dav.conf httpd-manual.conf httpd-autoindex.conf httpd-vhosts.conf httpd-ssl.conf httpd-multilang-errordoc.conf; do 106 sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 104 REPLACELIST="conf/extra/httpd-dav.conf conf/extra/httpd-manual.conf conf/extra/httpd-autoindex.conf conf/extra/httpd-vhosts.conf conf/extra/httpd-ssl.conf conf/extra/httpd-multilang-errordoc.conf conf/original/extra/httpd-dav.conf conf/original/extra/httpd-manual.conf conf/original/extra/httpd-autoindex.conf conf/original/extra/httpd-vhosts.conf conf/original/extra/httpd-ssl.conf conf/original/extra/httpd-multilang-errordoc.conf conf/original/httpd.conf lib/apr-util-1/apr_dbd_odbc.la lib/apr-util-1/apr_dbd_sqlite3.la lib/pkgconfig/apr-util-1.pc lib/pkgconfig/apr-1.pc lib/libaprutil-1.la lib/libapr-1.la build/config_vars.mk build/config.nice build/apr_rules.mk bin/apu-1-config bin/apr-1-config include/ap_config_auto.h include/ap_config_layout.h" 105 106 for one_file in $REPLACELIST; do 107 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$one_file" > "$one_file.tmp" 107 108 mv $one_file.tmp $one_file 108 109 chmod u+w $one_file 109 110 done 110 111 cd "$currentdir/conf/original/extra/"112 for one_file in httpd-dav.conf httpd-manual.conf httpd-autoindex.conf httpd-vhosts.conf httpd-ssl.conf httpd-multilang-errordoc.conf; do113 sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"114 mv $one_file.tmp $one_file115 chmod u+w $one_file116 done117 118 cd "$currentdir/lib/"119 for one_file in "apr-util-1/apr_dbd_odbc.la" "apr-util-1/apr_dbd_sqlite3.la" "pkgconfig/apr-util-1.pc" "pkgconfig/apr-1.pc" libaprutil-1.la libapr-1.la; do120 sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"121 mv $one_file.tmp $one_file122 chmod u+w $one_file123 done124 125 cd "$currentdir/build/"126 for one_file in config_vars.mk config.nice apr_rules.mk; do127 sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"128 mv $one_file.tmp $one_file129 chmod u+w $one_file130 done131 132 cd "$currentdir/bin/"133 for one_file in apu-1-config apr-1-config; do134 sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"135 mv $one_file.tmp $one_file136 chmod u+w $one_file137 done138 139 cd "$currentdir/include/"140 for one_file in ap_config_auto.h ap_config_layout.h; do141 sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"142 mv $one_file.tmp $one_file143 chmod u+w $one_file144 done145 146 sed -e "s;$PRE;$SR;" "$currentdir/conf/original/httpd.conf" > "$currentdir/conf/original/httpd.conf.tmp"147 mv "$currentdir/conf/original/httpd.conf.tmp" "$currentdir/conf/original/httpd.conf"148 chmod u+w "$currentdir/conf/original/httpd.conf"149 111 150 112 echo "Ready."
Note:
See TracChangeset
for help on using the changeset viewer.