From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 2 May 2008 12:25:29 +0000 (+0200)
Subject: Fix up DESTDIR support
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e6003e170faf7577b67dc45d9c344073285ab67;p=scalable-opengroupware.org

Fix up DESTDIR support
---

diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 00000000..dbb14fed
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+fix-destdir
diff --git a/debian/patches/fix-destdir.dpatch b/debian/patches/fix-destdir.dpatch
new file mode 100755
index 00000000..0aee89a3
--- /dev/null
+++ b/debian/patches/fix-destdir.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-destdir.dpatch by  <tfheen@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad sogo~/configure sogo/configure
+--- sogo~/configure	2008-05-02 14:20:54.000000000 +0200
++++ sogo/configure	2008-05-02 14:24:39.000000000 +0200
+@@ -303,16 +303,16 @@
+   else
+     cfgwrite "# configured for GNUstep install"
+     cfgwrite ""
+-    cfgwrite "SOGO_SYSLIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARY}/Libraries"
+-    cfgwrite "SOGO_LIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
++    cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_LIBRARY}/Libraries"
++    cfgwrite "SOGO_LIBDIR=\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
+     cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
+     cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
+-    cfgwrite "SOGO_TOOLS=\${DESTDIR}/\${GNUSTEP_TOOLS}"
+-    cfgwrite "SOGO_ADMIN_TOOLS=\${DESTDIR}/\${GNUSTEP_ADMIN_TOOLS}"
+-    cfgwrite "SOPE_SAXMAPPINGS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxMappings"
+-    cfgwrite "SOPE_SAXDRIVERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+-    cfgwrite "SOPE_WOXBUILDERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
+-    cfgwrite "SOGO_TYPEMODELS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/OCSTypeModels"
++    cfgwrite "SOGO_TOOLS=\${GNUSTEP_TOOLS}"
++    cfgwrite "SOGO_ADMIN_TOOLS=\${GNUSTEP_ADMIN_TOOLS}"
++    cfgwrite "SOPE_SAXMAPPINGS=\${GNUSTEP_LIBRARY}/SaxMappings"
++    cfgwrite "SOPE_SAXDRIVERS=\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
++    cfgwrite "SOPE_WOXBUILDERS=\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
++    cfgwrite "SOGO_TYPEMODELS=\${GNUSTEP_LIBRARY}/OCSTypeModels"
+   fi
+ 
+   if test $ARG_WITH_STRIP = 1; then