From cb422b4275b72a1519c86d5e3930058cd83cf4f1 Mon Sep 17 00:00:00 2001
From: Taco Hoekwater <taco@metatex.org>
Date: Wed, 11 Jun 2008 14:38:32 +0000
Subject: [PATCH] Make sure the build scripts work again

git-svn-id: svn+ssh://scm.foundry.supelec.fr/svn/metapost/mplib/trunk@555 b0617d17-b707-0410-b22c-fd2634e05cc4
---
 build.cross                      | 17 ++++-------------
 build.sh                         | 13 +++----------
 src/texk/web2c/mpdir/Makefile.am |  3 ++-
 src/texk/web2c/mpdir/Makefile.in |  3 ++-
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/build.cross b/build.cross
index 2c9c23a..03405d6 100755
--- a/build.cross
+++ b/build.cross
@@ -16,24 +16,15 @@ cd build-win/texk
 (cd kpathsea && $MAKE ../kpathsea/libkpathsea.la ) || exit 1
 
 # make the library
-mkdir web2c
 mkdir web2c/mpdir
-mkdir web2c/mpdir/lib
-cd web2c/mpdir/lib
-(../../../../../src/texk/web2c/mpdir/lib/configure \
+cd web2c/mpdir
+(../../../../src/texk/web2c/mpdir/configure \
     --host=i386-linux --enable-shared=no ; $MAKE )|| exit 1 
 
-# make the newmpost binary
-cd .. 
-ln -s ../../../../src/texk/web2c/mpdir/Makefile .
-ln -s ../../../../src/texk/web2c/mpdir/mpost.w .
-$MAKE || exit 1
-
 # strip them
-mv  newmpost newmpost.exe
-$STRIP newmpost.exe
+$STRIP mpost.exe
 cd ../../../..
 # show the results
-ls -l build-win/texk/web2c/mpdir/newmpost.exe
+ls -l build-win/texk/web2c/mpdir/mpost.exe
 
 
diff --git a/build.sh b/build.sh
index 3c80914..31ddf47 100755
--- a/build.sh
+++ b/build.sh
@@ -45,21 +45,14 @@ cd texk
 (cd kpathsea;  $MAKE ../kpathsea/libkpathsea.la) || exit 1
 
 # make the library
-mkdir web2c
 mkdir web2c/mpdir
-mkdir web2c/mpdir/lib
-cd web2c/mpdir/lib
-(../../../../../src/texk/web2c/mpdir/lib/configure; $MAKE )|| exit 1 
+cd web2c/mpdir
+(../../../../src/texk/web2c/mpdir/configure; $MAKE )|| exit 1 
 
-# make the newmpost binary
-cd .. 
-ln -s ../../../../src/texk/web2c/mpdir/Makefile .
-ln -s ../../../../src/texk/web2c/mpdir/mpost.w .
-$MAKE || exit 1
 # strip them
 #STRIP=strip
 # $STRIP web2c/mpdir/newmpost
 # go back
 cd ../../../..
 # show the results
-ls -l build/texk/web2c/mpdir/newmpost
+ls -l build/texk/web2c/mpdir/mpost
diff --git a/src/texk/web2c/mpdir/Makefile.am b/src/texk/web2c/mpdir/Makefile.am
index 7f09524..ff523dc 100644
--- a/src/texk/web2c/mpdir/Makefile.am
+++ b/src/texk/web2c/mpdir/Makefile.am
@@ -2,8 +2,9 @@
 AUTOMAKE_OPTIONS = foreign
 
 KPSEBUILDDIR = ../../../texk/kpathsea/.libs
+KPSESRCDIR = ../../../../src/texk/kpathsea
 KPSELIB=$(KPSEBUILDDIR)/libkpathsea.a
-CFLAGS=-Wall -W -g -I. -I../..
+CFLAGS=-Wall -W -g -I. -I../.. -I$(KPSESRCDIR)/..
 
 bin_PROGRAMS = mpost
 
diff --git a/src/texk/web2c/mpdir/Makefile.in b/src/texk/web2c/mpdir/Makefile.in
index 4b8c319..08ec52e 100644
--- a/src/texk/web2c/mpdir/Makefile.in
+++ b/src/texk/web2c/mpdir/Makefile.in
@@ -105,7 +105,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -Wall -W -g -I. -I../..
+CFLAGS = -Wall -W -g -I. -I../.. -I$(KPSESRCDIR)/..
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -204,6 +204,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 KPSEBUILDDIR = ../../../texk/kpathsea/.libs
+KPSESRCDIR = ../../../../src/texk/kpathsea
 KPSELIB = $(KPSEBUILDDIR)/libkpathsea.a
 mpost_SOURCES = mpost.c 
 mpost_DEPENDENCIES = libmplib.a
-- 
2.32.0.93.g670b81a890