--- Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/f/34_Makefile.a 1.4 640)
+++ Makefile.am Tue, 13 May 2003 02:31:08 +0200 vasseu_c (meta-c++-grammar/f/34_Makefile.a 1.4 640)
@@ -1,4 +1,4 @@
 SUBDIRS = config src lib test
 EXTRA_DIST = stdconfig bootstrap Makefile.xt
 include Makefile.xt
-XTC_IMPORT = $(STRATEGOXT)/share/StrategoXT/XTC
+XTC_IMPORT = $(STRATEGOXT)/share/xt-strategoxt/XTC
Index: stdconfig
--- stdconfig Tue, 25 Mar 2003 06:44:56 +0100 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
+++ stdconfig Tue, 06 May 2003 18:49:58 +0200 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
@@ -1,9 +1,7 @@
 #!/bin/sh

-XT_PREFIX=$HOME/xt
+XT=/usr

 ./bootstrap
-./configure --prefix=$HOME \
-            --with-xt=$XT_PREFIX \
-            --with-stratego-xt=$XT_PREFIX \
-            --with-xtc=$XT_PREFIX
+./configure --prefix=$HOME --with-xt=$XT \
+CFLAGS="-I/usr/include/xt-strategoxt -I/usr/include/xt-aterm"
Index: src/pp/Makefile.am
--- src/pp/Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/g/48_Makefile.a 1.1 644)
+++ src/pp/Makefile.am Wed, 07 May 2003 01:30:41 +0200 vasseu_c (meta-c++-grammar/g/48_Makefile.a 1.1 644)
@@ -2,7 +2,7 @@

 bin_PROGRAMS   = pp-cpp
 SCFLAGS                = --main $*
-STRINCLUDES    = -I $(XTC)/share/xtc -I $(GPP)/share/gpp
+STRINCLUDES    = -I $(XTCFLAGS)
 pkgdata_DATA   = Cpp-pretty.pp.af
 EXTRA_DIST     = Cpp-pretty.pp pp-cpp.str unbox.str
 CLEANFILES     = Cpp-pretty.pp.af