[OGo-Developer] Re: [SOGo] sope/sogo and gnustep-make 2
Wolfgang Sourdeau
developer@opengroupware.org
Thu, 03 Jan 2008 12:21:05 -0500
------=_=-_OpenGroupware_org_NGMime-2177-1199380865.783432-2------
content-type: text/plain; charset=utf-8
content-length: 2120
content-transfer-encoding: quoted-printable
Le 03 Jan. 2008 11:30 EST, "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de> a =C3=A9crit:
> sogo@opengroupware.org wrote:
> > Hi Sebastian,
> >
> >
> > Your contribution is really appreciated, I will review your patch as soon
> as possible. I previously made an attempt at this, but the SOGo modules
> would not load because of the hardcoded paths in SOPE. I have looked at your
> yeah, despite Helge insits, that these are only hardcoded RELATIVE paths ;)
>
> discussion regarding this in the sope-dev mailing list and I am going to
> join it instead of discussing this here.
>
> I have a combined bunch of diffs for sope, including my gnustep-make
> patchess, and your sogo patchset from the SOPE dir in the sogo sources.
>
> I could send these to you offlist.
>
> Because of the hardcoded relative paths, it is only working for FHS
> installation, We have to define some sane relative subdirectory names that
> can be used for GNUstep based filesystem layouts.
> When we can agree on sth. before weekend, I think I can get all
> (sope/sogo/opengroupware) updated to be able to run in GNUstep filesystem
> layouts by the end of the weekend.
>
> but as you said, lets move to the developer@ list.
Hi again,
I am sending you my version, that I did one or two weeks before leaving on vacation...
The particularity of my patches is to keep compatibility with gsmake 1.0. Is that something that we want?
Also, I had to adapt the SOPE additional Makefiles. But I have doubts regarding those modifications because I am not sure which clause is used and when...
Finally, I did not find any patch for SOGo in your patchset?
--
Wolfgang Sourdeau
T: +1 514 989-2000 ext. 2602 C: +1 514 755-3520
AVIS - Ce courriel pourrait contenir des renseignements confidentiels ou
privil=C3=A9gi=C3=A9s. Si vous n'en =C3=AAtes pas le v=C3=A9ritable destinataire, veuillez nous
aviser imm=C3=A9diatement. Merci.
NOTICE - This e-mail may contain confidential or privileged information.
If you are not the intended recipient, please notify us immediately. Thank you.
------=_=-_OpenGroupware_org_NGMime-2177-1199380865.783432-2------
content-type: text/plain
content-disposition: attachment; filename="SOPE-gsmake2.diff"
content-length: 16300
content-transfer-encoding: quoted-printable
Index: configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- configure (r=E9vision 1557)
+++ configure (copie de travail)
@@ -327,6 +327,11 @@
cfgwrite ""
else
cfgwrite "# configured for GNUstep install"
+ if test "x$GNUSTEP_SYSTEM_USERS_DIR" !=3D "x"; then
+ cfgwrite "GNUSTEP_INSTALLATION_DOMAIN:=3DSYSTEM"
+ else
+ cfgwrite "GNUSTEP_INSTALLATION_DIR:=3D\$(GNUSTEP_SYSTEM_ROOT)"
+ fi
fi
if test $ARG_WITH_DEBUG =3D 1; then
Index: sope-gdl1/PostgreSQL/GNUmakefile.preamble
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-gdl1/PostgreSQL/GNUmakefile.preamble (r=E9vision 1557)
+++ sope-gdl1/PostgreSQL/GNUmakefile.preamble (copie de travail)
@@ -27,8 +27,12 @@
ifeq ($(frameworks),yes)
BUNDLE_INSTALL_DIR :=3D $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
else
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
endif
+endif
# PG config
Index: sope-gdl1/SQLite3/GNUmakefile.preamble
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-gdl1/SQLite3/GNUmakefile.preamble (r=E9vision 1557)
+++ sope-gdl1/SQLite3/GNUmakefile.preamble (copie de travail)
@@ -27,8 +27,12 @@
ifeq ($(frameworks),yes)
BUNDLE_INSTALL_DIR :=3D $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
else
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
endif
+endif
# SQLite3 config
Index: sope-gdl1/FrontBase2/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-gdl1/FrontBase2/GNUmakefile (r=E9vision 1557)
+++ sope-gdl1/FrontBase2/GNUmakefile (copie de travail)
@@ -51,7 +51,11 @@
FrontBase2_RESOURCE_FILES =3D Info.plist Version
BUNDLE_INSTALL =3D FrontBase2
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_SYSTEM_ROOT)/Libraries/Adaptors
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
# Use .gdladaptor as the bundle extension
BUNDLE_EXTENSION =3D .gdladaptor
Index: sope-gdl1/MySQL/GNUmakefile.preamble
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-gdl1/MySQL/GNUmakefile.preamble (r=E9vision 1557)
+++ sope-gdl1/MySQL/GNUmakefile.preamble (copie de travail)
@@ -27,8 +27,12 @@
ifeq ($(frameworks),yes)
BUNDLE_INSTALL_DIR :=3D $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
else
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
endif
+endif
MySQL_BUNDLE_LIBS +=3D \
Index: sope-gdl1/Oracle8/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-gdl1/Oracle8/GNUmakefile (r=E9vision 1557)
+++ sope-gdl1/Oracle8/GNUmakefile (copie de travail)
@@ -51,8 +51,12 @@
ifeq ($(frameworks),yes)
BUNDLE_INSTALL_DIR :=3D $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
else
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
endif
+endif
Oracle8_OBJC_FILES =3D \
EOAttribute+Oracle.m \
Index: sope-xml/libxmlSAXDriver/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-xml/libxmlSAXDriver/GNUmakefile (r=E9vision 1557)
+++ sope-xml/libxmlSAXDriver/GNUmakefile (copie de travail)
@@ -7,7 +7,11 @@
BUNDLE_NAME =3D libxmlSAXDriver
BUNDLE_EXTENSION =3D .sax
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
libxmlSAXDriver_PCH_FILE =3D common.h
Index: sope-xml/ChangeLogSaxDriver/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-xml/ChangeLogSaxDriver/GNUmakefile (r=E9vision 1557)
+++ sope-xml/ChangeLogSaxDriver/GNUmakefile (copie de travail)
@@ -7,7 +7,11 @@
BUNDLE_NAME =3D ChangeLogSaxDriver
BUNDLE_EXTENSION =3D .sax
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
ChangeLogSaxDriver_OBJC_FILES =3D \
ChangeLogSaxDriver.m \
Index: sope-xml/STXSaxDriver/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-xml/STXSaxDriver/GNUmakefile (r=E9vision 1557)
+++ sope-xml/STXSaxDriver/GNUmakefile (copie de travail)
@@ -7,7 +7,11 @@
BUNDLE_NAME =3D STXSaxDriver
BUNDLE_EXTENSION =3D .sax
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
STXSaxDriver_PCH_FILE =3D common.h
Index: sope-xml/pyxSAXDriver/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-xml/pyxSAXDriver/GNUmakefile (r=E9vision 1557)
+++ sope-xml/pyxSAXDriver/GNUmakefile (copie de travail)
@@ -7,7 +7,11 @@
BUNDLE_NAME =3D pyxSAXDriver
BUNDLE_EXTENSION =3D .sax
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_USER_ROOT)/Library/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
pyxSAXDriver_OBJC_FILES =3D pyxSAXDriver.m
Index: sope-appserver/SoOFS/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/SoOFS/GNUmakefile (r=E9vision 1557)
+++ sope-appserver/SoOFS/GNUmakefile (copie de travail)
@@ -75,7 +75,11 @@
BUNDLE_NAME =3D SoOFS
BUNDLE_EXTENSION =3D .sxp
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
SoOFS_OBJC_FILES =3D SoOFSProduct.m
SoOFS_RESOURCE_FILES =3D product.plist Version
Index: sope-appserver/WEExtensions/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/WEExtensions/GNUmakefile (r=E9vision 1557)
+++ sope-appserver/WEExtensions/GNUmakefile (copie de travail)
@@ -11,9 +11,12 @@
BUNDLE_NAME =3D WEExtensions
BUNDLE_EXTENSION =3D .wox
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
-
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
+else
FRAMEWORK_NAME =3D WEExtensions
endif
Index: sope-appserver/NGObjWeb/wobundle-gs.make
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/NGObjWeb/wobundle-gs.make (r=E9vision 1557)
+++ sope-appserver/NGObjWeb/wobundle-gs.make (copie de travail)
@@ -85,8 +85,12 @@
endif
ifeq ($(WOBUNDLE_INSTALL_DIR),)
-WOBUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Libraries
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+WOBUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/
+else
+WOBUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/
endif
+endif
# The name of the bundle is in the BUNDLE_NAME variable.
# The list of languages the bundle is localized in are in xxx_LANGUAGES
# The list of bundle resource file are in xxx_RESOURCE_FILES
Index: sope-appserver/NGObjWeb/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/NGObjWeb/GNUmakefile (r=E9vision 1557)
+++ sope-appserver/NGObjWeb/GNUmakefile (copie de travail)
@@ -167,7 +167,11 @@
BUNDLE_NAME =3D SoCore
BUNDLE_EXTENSION =3D .sxp
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
SoCore_PCH_FILE =3D common.h
SoCore_OBJC_FILES =3D SoCoreProduct.m
Index: sope-appserver/NGObjWeb/woapp-gs.make
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/NGObjWeb/woapp-gs.make (r=E9vision 1557)
+++ sope-appserver/NGObjWeb/woapp-gs.make (copie de travail)
@@ -103,8 +103,13 @@
# Determine the application directory extension
WOAPP_EXTENSION =3D woa
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
GNUSTEP_WOAPPS =3D $(GNUSTEP_INSTALLATION_DIR)/WOApps
+else
+GNUSTEP_WOAPPS =3D $(GNUSTEP_WEB_APPS)
+endif
+
.PHONY: internal-woapp-all_ \
internal-woapp-install_ \
internal-woapp-uninstall_ \
Index: sope-appserver/WEPrototype/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/WEPrototype/GNUmakefile (r=E9vision 1557)
+++ sope-appserver/WEPrototype/GNUmakefile (copie de travail)
@@ -10,8 +10,12 @@
BUNDLE_NAME =3D WEPrototype
BUNDLE_EXTENSION =3D .wox
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
+else
FRAMEWORK_NAME =3D WEPrototype
endif
Index: sope-appserver/WOExtensions/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-appserver/WOExtensions/GNUmakefile (r=E9vision 1557)
+++ sope-appserver/WOExtensions/GNUmakefile (copie de travail)
@@ -9,7 +9,11 @@
LIBRARY_NAME =3D libWOExtensions
BUNDLE_NAME =3D WOExtensions
BUNDLE_EXTENSION =3D .wox
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
else
FRAMEWORK_NAME =3D WOExtensions
Index: sope-ical/versitSaxDriver/GNUmakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-ical/versitSaxDriver/GNUmakefile (r=E9vision 1557)
+++ sope-ical/versitSaxDriver/GNUmakefile (copie de travail)
@@ -7,7 +7,11 @@
BUNDLE_NAME =3D versitSaxDriver
BUNDLE_EXTENSION =3D .sax
-BUNDLE_INSTALL_DIR =3D $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+BUNDLE_INSTALL_DIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+BUNDLE_INSTALL_DIR =3D $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+endif
versitSaxDriver_PRINCIPAL_CLASS =3D VSSaxDriver
Index: sope-ical/NGiCal/GNUmakefile.postamble
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sope-ical/NGiCal/GNUmakefile.postamble (r=E9vision 1557)
+++ sope-ical/NGiCal/GNUmakefile.postamble (copie de travail)
@@ -1,8 +1,12 @@
# compilation settings
ifeq ($(FHS_INSTALL_ROOT),)
-MAPDIR=3D"$(GNUSTEP_INSTALLATION_DIR)/Library/SaxMappings/"
+ifeq ($(GNUSTEP_INSTALLATION_DOMAIN),)
+MAPDIR =3D $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)/Library/SaxMappings/
else
+MAPDIR =3D $(GNUSTEP_LIBRARY)/SaxMappings/
+endif
+else
MAPDIR=3D"$(FHS_INSTALL_ROOT)/share/sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxmappings/"
endif
------=_=-_OpenGroupware_org_NGMime-2177-1199380865.783432-2--------