wsanchez 99/05/03 19:55:16
Modified: . Makefile.tmpl config.layout configure Log: Make htdocs, iconsdir, and cgidir configurable via config.layout. Revision Changes Path 1.82 +3 -3 apache-1.3/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- Makefile.tmpl 1999/05/03 10:23:46 1.81 +++ Makefile.tmpl 1999/05/04 02:55:14 1.82 @@ -112,9 +112,9 @@ mandir = @mandir@ sysconfdir = @sysconfdir@ datadir = @datadir@ -iconsdir = $(datadir)/icons -htdocsdir = $(datadir)/htdocs -cgidir = $(datadir)/cgi-bin +iconsdir = @iconsdir@ +htdocsdir = @htdocsdir@ +cgidir = @cgidir@ includedir = @includedir@ localstatedir = @localstatedir@ runtimedir = @runtimedir@ 1.8 +18 -0 apache-1.3/config.layout Index: config.layout =================================================================== RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config.layout 1999/05/03 23:02:57 1.7 +++ config.layout 1999/05/04 02:55:14 1.8 @@ -19,6 +19,9 @@ mandir: $prefix/man sysconfdir: $prefix/conf datadir: $prefix + iconsdir: $datadir/icons + htdocsdir: $datadir/htdocs + cgidir: $datadir/cgi-bin includedir: $prefix/include localstatedir: $prefix runtimedir: $localstatedir/logs @@ -37,6 +40,9 @@ mandir: $prefix/man sysconfdir: $prefix/etc+ datadir: $prefix/share+ + iconsdir: $datadir/icons + htdocsdir: $datadir/htdocs + cgidir: $datadir/cgi-bin includedir: $prefix/include+ localstatedir: $prefix/var+ runtimedir: $localstatedir/run @@ -54,6 +60,9 @@ mandir: man sysconfdir: conf datadir: + iconsdir: icons + htdocsdir: htdocs + cgidir: cgi-bin includedir: include localstatedir: runtimedir: logs @@ -71,6 +80,9 @@ mandir: $exec_prefix/share/man sysconfdir: $prefix/Configuration datadir: $prefix + iconsdir: /Local/Library/Apache/Icons + htdocsdir: $datadir/Documents + cgidir: $datadir/CGI-Executables includedir: /Local/Library/Frameworks/Apache.framework/Versions/1.3/Headers localstatedir: /var runtimedir: $prefix/Logs @@ -88,6 +100,9 @@ mandir: $prefix/man sysconfdir: /etc/httpd/conf datadir: /home/httpd + iconsdir: $datadir/icons + htdocsdir: $datadir/htdocs + cgidir: $datadir/cgi-bin includedir: $prefix/include/apache localstatedir: /var runtimedir: $localstatedir/run @@ -105,6 +120,9 @@ mandir: $prefix/man sysconfdir: /etc$prefix datadir: $prefix/share + iconsdir: $datadir/icons + htdocsdir: $datadir/htdocs + cgidir: $datadir/cgi-bin includedir: $prefix/include localstatedir: /var$prefix runtimedir: $localstatedir/run 1.90 +11 -4 apache-1.3/configure Index: configure =================================================================== RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- configure 1999/05/02 02:56:02 1.89 +++ configure 1999/05/04 02:55:15 1.90 @@ -437,8 +437,8 @@ OOIFS="$IFS" # most likely not needed: jmj IFS="$DIFS" # ditto for var in prefix exec_prefix bindir sbindir libexecdir mandir \ - sysconfdir datadir includedir localstatedir runtimedir \ - logfiledir proxycachedir; do + sysconfdir datadir iconsdir htdocsdir cgidir includedir \ + localstatedir runtimedir logfiledir proxycachedir; do eval "val=\"\$$var\"" case $val in *+ ) @@ -1004,8 +1004,9 @@ OIFS="$IFS" IFS="$DIFS" for var in prefix exec_prefix bindir sbindir libexecdir mandir \ - sysconfdir datadir includedir localstatedir runtimedir \ - logfiledir proxycachedir suexec_docroot suexec_logexec; do + sysconfdir datadir iconsdir htdocsdir cgidir includedir \ + localstatedir runtimedir logfiledir proxycachedir \ + suexec_docroot suexec_logexec; do eval "val=\"\$$var\""; val=`echo $val | sed -e 's:/*$::'` eval "$var=\"$val\"" @@ -1111,6 +1112,9 @@ echo " mandir: $mandir" echo " sysconfdir: $sysconfdir" echo " datadir: $datadir" + echo " iconsdir: $iconsdir" + echo " htdocsdir: $htdocsdir" + echo " cgidir: $cgidir" echo " includedir: $includedir" echo " localstatedir: $localstatedir" echo " runtimedir: $runtimedir" @@ -1173,6 +1177,9 @@ -e "[EMAIL PROTECTED]@%$mandir%g" \ -e "[EMAIL PROTECTED]@%$sysconfdir%g" \ -e "[EMAIL PROTECTED]@%$datadir%g" \ +-e "[EMAIL PROTECTED]@%$iconsdir%g" \ +-e "[EMAIL PROTECTED]@%$htdocsdir%g" \ +-e "[EMAIL PROTECTED]@%$cgidir%g" \ -e "[EMAIL PROTECTED]@%$localstatedir%g" \ -e "[EMAIL PROTECTED]@%$includedir%g" \ -e "[EMAIL PROTECTED]@%$runtimedir%g" \