From acc868d91d1457770f3b85c9636d7370721bf1a9 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Mon, 1 Nov 2004 00:50:19 +0000
Subject: [PATCH] Removed --with-appsdir option and replaced it with
 --with-gnustepdir. Also, default installation path (for non GNUstep users) is
 now $(prefix)/bin

---
 ChangeLog                   |  4 ++++
 NEWS                        | 12 ++++++++++++
 WPrefs.app/Makefile.am      |  4 ++--
 WPrefs.app/tiff/Makefile.am |  2 +-
 WPrefs.app/xpm/Makefile.am  |  2 +-
 configure.ac                | 36 +++++++++++++-----------------------
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57e7fbac..baa5a4fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+
+- Removed --with-appsdir option and replaced it with --with-gnustepdir. Also,
+  default installation path (for non GNUstep users) is now $(prefix)/bin
+
 Changes since version 0.91.0:
 .............................
 - fixed crash with info panel and alt-tabbing
diff --git a/NEWS b/NEWS
index 09457336..62abdbfd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,18 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
+--- 0.92.0
+
+GNUstep Installation Directory
+------------------------------
+
+WPrefs is now installed in /usr/local/bin and /usr/local/share by default.
+If you use GNUstep and want it to install in /usr/GNUstep/Applications,
+you may specify --with-gnustepdir=/usr/GNUstep
+If the GNUSTEP_LOCAL_ROOT environment variable is defined when configure is
+executed, it will be used (and you don't need to use --with-gnustepdir)
+
+
 --- 0.91.1
 
 To disable the panel shown during Alt-tabbing, you may put the following in
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 917a46e2..36373eeb 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -2,11 +2,11 @@ SUBDIRS = xpm tiff po
 
 AUTOMAKE_OPTIONS = no-dependencies
 
-wpexecbindir = @wprefsdir@
+wpexecbindir = @wprefs_bindir@
 
 wpexecbin_PROGRAMS = WPrefs 
 
-wpdatadir = @wprefsdir@
+wpdatadir = @wprefs_datadir@
 
 wpdata_DATA = WPrefs.tiff WPrefs.xpm
 
diff --git a/WPrefs.app/tiff/Makefile.am b/WPrefs.app/tiff/Makefile.am
index 078bf430..4940a48d 100644
--- a/WPrefs.app/tiff/Makefile.am
+++ b/WPrefs.app/tiff/Makefile.am
@@ -1,4 +1,4 @@
-tiffdatadir = $(wprefsdir)/tiff
+tiffdatadir = $(wprefs_datadir)/tiff
 
 EXTRA_DIST = \
 	advancetonewworkspace.tiff \
diff --git a/WPrefs.app/xpm/Makefile.am b/WPrefs.app/xpm/Makefile.am
index 30682b31..6bb902f2 100644
--- a/WPrefs.app/xpm/Makefile.am
+++ b/WPrefs.app/xpm/Makefile.am
@@ -1,4 +1,4 @@
-xpmdatadir = $(wprefsdir)/xpm
+xpmdatadir = $(wprefs_datadir)/xpm
 
 
 EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index 7f088821..da410467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,24 +15,10 @@ AC_INIT(src/WindowMaker.h)
 
 
 
-AM_INIT_AUTOMAKE(WindowMaker, 0.91.0)
+AM_INIT_AUTOMAKE(WindowMaker, 0.92.0)
 
 AC_PROG_LIBTOOL
 
-dnl # by Marcelo Magallon <mmagallo@efis.ucr.ac.cr>
-dnl # Turn around -rpath problem with libtool 1.0c
-dnl # This define should be improbable enough to not conflict with anything
-dnl case ${host} in
-dnl   *-pc-linux-gnu)
-dnl     AC_MSG_RESULT([Fixing libtool for -rpath problems.])
-dnl     sed < libtool > libtool-2 \
-dnl     's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
-dnl     mv libtool-2 libtool
-dnl     chmod 755 libtool
-dnl   ;;
-dnl esac
-
-
 AM_CONFIG_HEADER(src/config.h)
 
 
@@ -845,22 +831,26 @@ dnl ==============================================
 appspath=""
 
 AC_ARG_WITH(appspath,
-[  --with-appspath=PATH    specify the directory for GNUstep applications], appspath=$withval )
+[  --with-gnustepdir=PATH    specify the directory for GNUstep applications], appspath=$withval )
 
-if test "x$appspath" = "x"; then
-    gnustepdir='${prefix}/GNUstep'
+if test "$appspath$GNUSTEP_LOCAL_ROOT" = ""; then
+    wprefs_datadir="${datadir}/WPrefs"
+    wprefs_bindir="${bindir}"
+else
+    gnustepdir=$appspath
 
     if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
 	gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"`
 	gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
     fi
 
-    with_appspath=$gnustepdir/Applications
+    xx=$gnustepdir/Applications
+    wprefs_datadir=$xx/WPrefs.app
+    wprefs_bindir=$xx/WPrefs.app
 fi
 
-wprefsdir=$with_appspath/WPrefs.app
-
-AC_SUBST(wprefsdir)
+AC_SUBST(wprefs_datadir)
+AC_SUBST(wprefs_bindir)
 
 
 dnl Enable User Defined Menu thing
@@ -1094,7 +1084,7 @@ echo "Window Maker was configured as follows:"
 echo
 echo "Installation path prefix            : $prefix"
 echo "Installation path for binaries      : $_bindir"
-echo "Installation path for WPrefs.app    : $with_appspath" | sed -e 's|\${prefix}|'"$prefix|"
+echo "Installation path for WPrefs.app    : $wprefs_bindir" | sed -e 's|\${exec_prefix}|'"$exec_prefix|"  -e 's|\${prefix}|'"$prefix|"
 echo "Supported graphic format libraries  : $supported_gfx"
 echo "Use assembly routines for wrlib     : $asm_support"
 echo "Use inline MMX(tm) x86 assembly     : $mmx_support"
-- 
2.11.4.GIT