Adjust rules for gsmake 2

[sope] / debian / rules

diff --git a/debian/rules b/debian/rules
index 3b266d560d30834d9bafd5c3e7bc2335682168ec..3b5526c74189b33fdaf4fe0109f664ebde1b7852 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ CFLAGS = -Wall -g
 #WARN: doesn't compile/package if HAS_LIBRARY_* options not present (since we use configure now)
 MAKE_FLAGS = messages=yes OPTFLAG=-O0 HAS_LIBRARY_ldap=yes HAS_LIBRARY_pq=yes HAS_LIBRARY_xml2=yes
 
-GNUSTEP_SETUP=/usr/lib/opengroupware.org/System/Library/Makefiles/GNUstep.sh
+GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
+GNUSTEP_SETUP=$(GNUSTEP_MAKEFILES)/GNUstep.sh
 
 include Version
 SOPEVER=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -50,16 +51,16 @@ clean-controlfiles:
                done; \
                rm controlfiles.tmp; \
        fi
-       
+
 debian/control: debian/control.in debian/rules
        sed -e s/_SOPEVER_/$(SOPEVER)/g < debian/control.in > debian/control
 
 config.status: configure
        dh_testdir
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
-               ./configure
-       
-build: build-stamp controlfiles
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+               ./configure --with-gnustep
+
+build: config.status build-stamp controlfiles
 build-stamp: patch-stamp
        dh_testdir
 
@@ -68,13 +69,13 @@ build-stamp: patch-stamp
        ln -s /usr/share/misc/config.guess sope-core/NGStreams/config.guess
        ln -s /usr/share/misc/config.sub sope-core/NGStreams/config.sub
 
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) all
 
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) APXS="/usr/bin/apxs2" APXS_INCLUDE_DIRS="$(shell apxs2 -q EXTRA_INCLUDES)" \
                -C sope-appserver/mod_ngobjweb all
-       
+
        touch build-stamp
 
 clean: unpatch clean-controlfiles
@@ -96,11 +97,11 @@ clean: unpatch clean-controlfiles
                mv sope-core/NGStreams/config.sub.upstream sope-core/NGStreams/config.sub; \
        fi
 
-       -. $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb clean
-       -. $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb distclean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb clean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb distclean
 
-       -. $(GNUSTEP_SETUP); $(MAKE) clean
-       -. $(GNUSTEP_SETUP); $(MAKE) distclean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) clean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) distclean
 
        dh_clean 
 
@@ -111,14 +112,16 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/tmp
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES)  CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) install \
-               GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/$$GNUSTEP_SYSTEM_ROOT\
-               INSTALL_ROOT_DIR=$(CURDIR)/debian/tmp\
-               FHS_INSTALL_ROOT=$(CURDIR)/debian/tmp/usr \
+               DESTDIR=$(CURDIR)/debian/tmp \
+               GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+               FHS_INSTALL_ROOT=/usr \
                FHS_LIB_DIR=$(CURDIR)/debian/tmp/usr/lib/ #WARN: <- trailing slash unbroke build/packages?!
 
-       CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \
+#              GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/$$GNUSTEP_SYSTEM_ROOT\
+
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb install \
                GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/usr/lib/apache2/modules
 
@@ -135,7 +138,7 @@ binary-arch: build install
        dh_installchangelogs 
        dh_installdocs
        dh_installexamples
-       dh_install --sourcedir=debian/tmp
+       dh_install --sourcedir=debian/tmp --list-missing
 #      dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate