[xiph-commits] r3587 - mod_annodex-ap20/trunk

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-05-04 21:07:37 -0700 (Sun, 04 May 2008)
New Revision: 3587

Modified:
   mod_annodex-ap20/trunk/Makefile
Log:
Update Makefile to work with current apache2

Modified: mod_annodex-ap20/trunk/Makefile
===================================================================
--- mod_annodex-ap20/trunk/Makefile	2008-05-04 06:05:05 UTC (rev 3586)
+++ mod_annodex-ap20/trunk/Makefile	2008-05-05 04:07:37 UTC (rev 3587)
@@ -1,16 +1,12 @@
 ##
-##  Makefile -- Build procedure for Annodex Apache module
-##  Originally autogenerated via ``apxs -n annodex -g''.
+##  Makefile -- Build procedure for sample annodex Apache module
+##  Autogenerated via ``apxs -n annodex -g''.
 ##
 
 builddir=.
-
-## Default paths
 top_srcdir=/usr/share/apache2
 top_builddir=/usr/share/apache2
 include /usr/share/apache2/build/special.mk
-#LIBTOOL=/usr/bin/libtool
-#SH_LIBTOOL=/usr/bin/libtool
 
 ## OS X/Fink: comment out default paths above, and uncomment these
 #top_srcdir=/usr/share/httpd
@@ -19,14 +15,14 @@
 #LIBTOOL=/sw/bin/glibtool
 #SH_LIBTOOL=/sw/bin/glibtool
 
-# Tools
+#   the used tools
 APXS=apxs2
 APACHECTL=apache2ctl
 
 #   additional defines, includes and libraries
 #DEFS=-Dmy_define=my_value
 #INCLUDES=-Imy/include/dir
-INCLUDES=-I/usr/include/apache2 -I/usr/include/apr-0/ `pkg-config --cflags annodex cmml`
+INCLUDES=`pkg-config --cflags annodex cmml`
 #LIBS=-Lmy/lib/dir -lmylib
 SH_LIBS=`pkg-config --libs annodex cmml`
 
@@ -34,7 +30,7 @@
 all: local-shared-build
 
 #   install the shared object file into Apache 
-install: install-modules
+install: install-modules-yes
 
 #   cleanup
 clean: