amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-01 16:39:46 +00:00
Code Issues Projects Releases Wiki Activity

merge of '08f744da20c99e50446879fca5f5ee8194b2217b'

Browse Source 
and '783f97bcf896d7f1f4a68b2bdb211c79e4383241'

Monotone-Parent: 08f744da20c99e50446879fca5f5ee8194b2217b
Monotone-Parent: 783f97bcf896d7f1f4a68b2bdb211c79e4383241
Monotone-Revision: c58fc8185274bae5a88c2fc98e49c56fb4e81878

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-29T18:49:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-29 18:49:21 +00:00
parent 1cc51af9ef ec8b94291e
commit aaaa125cca
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SOPE/sope-deb.diff
+15 -6
View File
@@ -95,17 +95,26 @@ Index: debian/rules
build-stamp: patch-stamp
dh_testdir
@@ -69,6 +69,9 @@
@@ -69,16 +69,10 @@
ln -s /usr/share/misc/config.sub sope-core/NGStreams/config.sub
CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
- $(MAKE) $(MAKE_FLAGS) all
+ ./configure --with-gnustep
+
+ CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
$(MAKE) $(MAKE_FLAGS) all
cp -R sope-appserver/mod_ngobjweb sope-appserver/mod_ngobjweb-apache2
@@ -119,21 +122,21 @@
- cp -R sope-appserver/mod_ngobjweb sope-appserver/mod_ngobjweb-apache2
-
CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
- $(MAKE) $(MAKE_FLAGS) APXS=/usr/bin/apxs -C sope-appserver/mod_ngobjweb all
-
- CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
- $(MAKE) $(MAKE_FLAGS) APXS="/usr/bin/apxs2" APXS_INCLUDE_DIRS="$(shell apxs2 -q EXTRA_INCLUDES)"\
- -C sope-appserver/mod_ngobjweb-apache2 all
+ $(MAKE) $(MAKE_FLAGS) all
touch build-stamp
@@ -119,21 +113,21 @@
# Add here commands to install the package into debian/tmp
CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
$(MAKE) $(MAKE_FLAGS) install \