[gs-commits] rev 11407 - trunk/gs/base

[hintak at ghostscript.com]

Author: hintak
Date: 2010-06-21 01:14:18 +0000 (Mon, 21 Jun 2010)
New Revision: 11407

Modified:
   trunk/gs/base/Makefile.in
   trunk/gs/base/configure.ac
Log:
auto-detect host as *BSD and use a differently named obj directory; no effect on non-*BSDs. fixes bug 687214

Modified: trunk/gs/base/Makefile.in
===================================================================
--- trunk/gs/base/Makefile.in	2010-06-21 00:32:43 UTC (rev 11406)
+++ trunk/gs/base/Makefile.in	2010-06-21 01:14:18 UTC (rev 11407)
@@ -24,13 +24,13 @@
 
 BINDIR=./bin
 GLSRCDIR=./base
-GLGENDIR=./obj
-GLOBJDIR=./obj
+GLGENDIR=@OBJDIR_BSDMAKE_WORKAROUND@
+GLOBJDIR=@OBJDIR_BSDMAKE_WORKAROUND@
 PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
-PSGENDIR=./obj
-PSOBJDIR=./obj
+PSGENDIR=@OBJDIR_BSDMAKE_WORKAROUND@
+PSOBJDIR=@OBJDIR_BSDMAKE_WORKAROUND@
 CONTRIBDIR=./contrib
 
 # Do not edit the next group of lines.

Modified: trunk/gs/base/configure.ac
===================================================================
--- trunk/gs/base/configure.ac	2010-06-21 00:32:43 UTC (rev 11406)
+++ trunk/gs/base/configure.ac	2010-06-21 01:14:18 UTC (rev 11407)
@@ -149,6 +149,20 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS([errno.h fcntl.h limits.h malloc.h memory.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/time.h syslog.h unistd.h])
 
+dnl --------------------------------------------------
+dnl Check for *BSD and apply BSD Make workaround
+dnl - BSD Make treats obj special and cd into it first.
+dnl --------------------------------------------------
+
+OBJDIR_BSDMAKE_WORKAROUND=./obj
+
+case `uname` in
+	*BSD)
+	OBJDIR_BSDMAKEWORKAOROUND="./notobj"
+	;;
+esac
+AC_SUBST(OBJDIR_BSDMAKE_WORKAROUND)
+
 # for gdev3b1.c (AT&T terminal interface)
 AC_CHECK_HEADER([sys/window.h])