Author: benm
Date: 2005-04-17 18:43:13 -0400 (Sun, 17 Apr 2005)
New Revision: 43177
Modified:
trunk/release/conf/mod_mono/ximian-build.conf
Log:
mod_mono cleanup -- remove our patches and reduce the config crap
Modified: trunk/release/conf/mod_mono/ximian-build.conf
===================================================================
--- trunk/release/conf/mod_mono/ximian-build.conf 2005-04-17 21:17:05 UTC
(rev 43176)
+++ trunk/release/conf/mod_mono/ximian-build.conf 2005-04-17 22:43:13 UTC
(rev 43177)
@@ -3,6 +3,12 @@
<!DOCTYPE module SYSTEM "helix-build.dtd">
<module>
+ <decl>
+ <macro id="apache">httpd</macro>
+ <macro
id="apachesysconfdir">[[usrsysconfdir]]/httpd/conf.d</macro>
+ <macro id="apachelibdir">[[usrlibdir]]/httpd/modules</macro>
+ </decl>
+
<targetset>
<rcsid>$Id: ximian-build.conf,v 1.33 2005/03/19 01:04:22 duncan Exp
$</rcsid>
<filter>
@@ -21,20 +27,16 @@
<i>mod_mono-[[version]].tar.gz-1</i>
</source>
- <patch>
- <i>modmono-makefile-redhat.patch-3</i>
- </patch>
-
<build id="default">
<prepare>[[usrconfigure]]</prepare>
<compile>${MAKE}</compile>
- <install>${MAKE} DESTDIR=${DESTDIR} install</install>
+ <install>${MAKE} DESTDIR=${DESTDIR} install
APXS_SYSCONFDIR="[[apachesysconfdir]]"</install>
<builddep id="buildrequires">
<i>mono-devel</i>
<i>xsp</i>
<i>pkgconfig</i>
- <i>httpd-devel</i>
+ <i>[[apache]]-devel</i>
</builddep>
<package id="default">
@@ -43,15 +45,15 @@
<psdata id="group">System Environment/Daemons</psdata>
<files>
- <i>[[usrlibdir]]/httpd/modules/mod_mono.so*</i>
- <i>[[usrsysconfdir]]/httpd/conf.d/mod_mono.conf</i>
+ <i>[[apachelibdir]]/mod_mono.so*</i>
+ <i>[[apachesysconfdir]]/mod_mono.conf</i>
<i>[[usrmandir]]/man8/mod_mono.8</i>
</files>
<docs />
<dep id="requires">
- <i>httpd</i>
+ <i>[[apache]]</i>
<i>xsp = [[version]]</i>
</dep>
@@ -63,42 +65,19 @@
</package>
</build>
</targetset>
-
- <targetset>
- <filter>
- <i>suse*</i>
- <i>sles*</i>
- <i>nld*</i>
- </filter>
-
- <patch>
- <i>mod_mono-makefile-sles9.patch-3</i>
- </patch>
-
- <build id="default">
-
- <builddep id="buildrequires">
- <i>mono-devel</i>
- <i>xsp</i>
- <i>pkgconfig</i>
- <i>apache2-devel</i>
- </builddep>
-
- <package id="default">
-
- <files>
- <i>[[usrlibdir]]/apache2/mod_mono.so*</i>
- <i>[[usrprefix]]/share/man/man8/mod_mono.8</i>
- <i>[[usrsysconfdir]]/apache2/conf.d/mod_mono.conf</i>
- </files>
-
- <dep id="requires">
- <i>apache2</i>
- <i>xsp = [[version]]</i>
- </dep>
- </package>
- </build>
- </targetset>
+
+ <targetset>
+ <filter>
+ <i>suse*</i>
+ <i>sles*</i>
+ <i>nld*</i>
+ </filter>
+ <decl>
+ <macro id="apache">apache2</macro>
+ <macro
id="apachesysconfdir">[[usrsysconfdir]]/apache2/conf.d</macro>
+ <macro id="apachelibdir">[[usrlibdir]]/apache2</macro>
+ </decl>
+ </targetset>
</module>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches