From 0d064bc9f99220f2e82f260543181938a083a71b Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Wed, 28 Feb 2007 07:00:36 +0000 Subject: [PATCH] MinGW updates git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24717 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 ++++ FilesystemLayouts/mingw | 72 +++++++++++++++++++++++++++++++++++++++++ configure | 3 +- configure.ac | 3 +- 4 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 FilesystemLayouts/mingw diff --git a/ChangeLog b/ChangeLog index 6300e0aa..15722239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-02-28 Nicola Pero + + * configure.ac: On MinGW, install the config file in + /etc/GNUstep/GNUstep.conf. + * configure: Regenerated. + * FilesystemLayouts/mingw: New layout. + 2007-02-26 Nicola Pero * Documentation/filesystem.texi: Updated the first half of the diff --git a/FilesystemLayouts/mingw b/FilesystemLayouts/mingw new file mode 100644 index 00000000..81557c7d --- /dev/null +++ b/FilesystemLayouts/mingw @@ -0,0 +1,72 @@ +# +# MSYS/MinGW filesystem layout +# +# This filesystem layout installs the stuff in your local MSYS/MinGW +# filesystem. At the moment it is identical to the fhs layout, but +# this might change. Use this on Windows with MSYS/MinGW if you want +# GNUstep to blend in your MSYS/MinGW environment and you are +# compiling all of your GNUstep system from source. + +# IMPORTANT: This configuration uses Unix paths. This is OK for +# gnustep-make (ie, the building system), but it is not OK for +# gnustep-base (ie, the runtime system). To work around this, when +# gnustep-base is configured, it will automatically use a +# ./GNUstep.conf file installed in the same directory as +# libgnustep-base.dll, and use paths relative to the location of +# libgnustep-base.dll. + +# To use gnustep-make in this environment, use 'export +# GNUSTEP_MAKEFILES=/usr/local/share/GNUstep/Makefiles' + +# By default, we install into /usr/local. +GNUSTEP_DEFAULT_PREFIX=/usr/local + +# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL +# paths. +GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles + +GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Apps +GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Apps +GNUSTEP_SYSTEM_TOOLS=/bin +GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin +GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep +GNUSTEP_SYSTEM_HEADERS=/include +GNUSTEP_SYSTEM_LIBRARIES=/lib +GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation +GNUSTEP_SYSTEM_DOC_MAN=/man +GNUSTEP_SYSTEM_DOC_INFO=/info + +GNUSTEP_NETWORK_APPS=/lib/GNUstep/Apps +GNUSTEP_NETWORK_ADMIN_APPS=/lib/GNUstep/Apps +GNUSTEP_NETWORK_TOOLS=/bin +GNUSTEP_NETWORK_ADMIN_TOOLS=/sbin +GNUSTEP_NETWORK_LIBRARY=/lib/GNUstep +GNUSTEP_NETWORK_HEADERS=/include +GNUSTEP_NETWORK_LIBRARIES=/lib +GNUSTEP_NETWORK_DOC=/share/GNUstep/Documentation +GNUSTEP_NETWORK_DOC_MAN=/man +GNUSTEP_NETWORK_DOC_INFO=/info + +GNUSTEP_LOCAL_APPS=/lib/GNUstep/Apps +GNUSTEP_LOCAL_ADMIN_APPS=/lib/GNUstep/Apps +GNUSTEP_LOCAL_TOOLS=/bin +GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin +GNUSTEP_LOCAL_LIBRARY=/lib/GNUstep +GNUSTEP_LOCAL_HEADERS=/include +GNUSTEP_LOCAL_LIBRARIES=/lib +GNUSTEP_LOCAL_DOC=/share/GNUstep/Documentation +GNUSTEP_LOCAL_DOC_MAN=/man +GNUSTEP_LOCAL_DOC_INFO=/info + +GNUSTEP_USER_DIR_APPS=GNUstep/Applications +GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin +GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools +GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin +GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library +GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers +GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries +GNUSTEP_USER_DIR_DOC=GNUstep/Documentation +GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man +GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info +GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf +GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults diff --git a/configure b/configure index 6e084d31..6207b70a 100755 --- a/configure +++ b/configure @@ -3464,8 +3464,7 @@ if test "$GNUSTEP_CONFIG_FILE" = "" -o "$GNUSTEP_CONFIG_FILE" = "no"; then case "$target_os" in freebsd* | openbsd* ) GNUSTEP_CONFIG_FILE=/usr/etc/GNUstep.conf ;; netbsd* ) GNUSTEP_CONFIG_FILE=/usr/pkg/etc/GNUstep.conf ;; - mingw32* ) GNUSTEP_CONFIG_FILE=/c/GNUstep/GNUstep.conf-dev ;; - *) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;; + *) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;; esac fi if echo "$GNUSTEP_CONFIG_FILE" | grep '[ \\] > /dev/null' diff --git a/configure.ac b/configure.ac index 32cf1678..7b61fda7 100644 --- a/configure.ac +++ b/configure.ac @@ -353,8 +353,7 @@ if test "$GNUSTEP_CONFIG_FILE" = "" -o "$GNUSTEP_CONFIG_FILE" = "no"; then case "$target_os" in freebsd* | openbsd* ) GNUSTEP_CONFIG_FILE=/usr/etc/GNUstep.conf ;; netbsd* ) GNUSTEP_CONFIG_FILE=/usr/pkg/etc/GNUstep.conf ;; - mingw32* ) GNUSTEP_CONFIG_FILE=/c/GNUstep/GNUstep.conf-dev ;; - *) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;; + *) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;; esac fi if echo "$GNUSTEP_CONFIG_FILE" | grep '[[ \\]] > /dev/null'