Permalink
Browse files

substitute BINDIR in apache config, rather than hardcoding /usr/local…

…/bin

git-svn-id: http://svn.kfish.org/fastphoto/trunk@215 9c49b5d1-7df3-0310-bce2-b7278e68f44c
  • Loading branch information...
1 parent dce152c commit 1f8fbfbd6e1beb9bc72789bc08f0f12aaa47ce28 conrad committed Feb 27, 2008
Showing with 10 additions and 7 deletions.
  1. +1 −1 Makefile.am
  2. +1 −1 apache/{fastphoto.conf → fastphoto.conf.in}
  3. +8 −5 configure.ac
View
@@ -2,4 +2,4 @@ SUBDIRS = src
man_MANS = fastphoto.1
-EXTRA_DIST = fastphoto.1 get_epeg_cvs.sh debian-postinst.sh apache/fastphoto.conf
+EXTRA_DIST = fastphoto.1 get_epeg_cvs.sh debian-postinst.sh apache/fastphoto.conf.in
@@ -1,4 +1,4 @@
<IfModule mod_actions.c>
- ScriptAlias /fastphoto /usr/local/bin/fastphoto
+ ScriptAlias /fastphoto @BINDIR@/fastphoto
Action image/jpeg /fastphoto
</IfModule>
View
@@ -195,16 +195,19 @@ else
AC_SUBST(SHLIB_VERSION_ARG)
AC_SUBST(SHARED_VERSION_INFO)
-AC_OUTPUT([
-Makefile
-src/Makefile
-])
-
#AS_AC_EXPAND(LIBDIR, ${libdir})
#AS_AC_EXPAND(INCLUDEDIR, ${includedir})
AS_AC_EXPAND(BINDIR, ${bindir})
AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+AC_SUBST(BINDIR)
+
+AC_OUTPUT([
+Makefile
+src/Makefile
+apache/fastphoto.conf
+])
+
AC_MSG_RESULT([
------------------------------------------------------------------------
$PACKAGE $VERSION: Automatic configuration OK.

0 comments on commit 1f8fbfb

Please sign in to comment.