Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 1f8fbfbd6e1beb9bc72789bc08f0f12aaa47ce28 1 parent dce152c
authored February 27, 2008
2  Makefile.am
@@ -2,4 +2,4 @@ SUBDIRS = src
2 2
 
3 3
 man_MANS = fastphoto.1
4 4
 
5  
-EXTRA_DIST = fastphoto.1 get_epeg_cvs.sh debian-postinst.sh apache/fastphoto.conf
  5
+EXTRA_DIST = fastphoto.1 get_epeg_cvs.sh debian-postinst.sh apache/fastphoto.conf.in
2  apache/fastphoto.conf → apache/fastphoto.conf.in
... ...
@@ -1,4 +1,4 @@
1 1
 <IfModule mod_actions.c>
2  
-  ScriptAlias /fastphoto /usr/local/bin/fastphoto
  2
+  ScriptAlias /fastphoto @BINDIR@/fastphoto
3 3
   Action image/jpeg /fastphoto
4 4
 </IfModule>
13  configure.ac
@@ -195,16 +195,19 @@ else
195 195
 AC_SUBST(SHLIB_VERSION_ARG)
196 196
 AC_SUBST(SHARED_VERSION_INFO)
197 197
 
198  
-AC_OUTPUT([
199  
-Makefile
200  
-src/Makefile
201  
-])
202  
-
203 198
 #AS_AC_EXPAND(LIBDIR, ${libdir})
204 199
 #AS_AC_EXPAND(INCLUDEDIR, ${includedir})
205 200
 AS_AC_EXPAND(BINDIR, ${bindir})
206 201
 AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
207 202
 
  203
+AC_SUBST(BINDIR)
  204
+
  205
+AC_OUTPUT([
  206
+Makefile
  207
+src/Makefile
  208
+apache/fastphoto.conf
  209
+])
  210
+
208 211
 AC_MSG_RESULT([
209 212
 ------------------------------------------------------------------------
210 213
   $PACKAGE $VERSION:  Automatic configuration OK.

0 notes on commit 1f8fbfb

Please sign in to comment.
Something went wrong with that request. Please try again.