summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/otps
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-10 13:18:47 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-10 13:18:47 +0000
commit5af1aa3cd449e5a6abb4972dcd9090bbe61162de (patch)
treecb4e4668b85d773dbb9ed7019ea250488a760948 /Build/source/texk/web2c/otps
parent3afa3f06a4c3c3750742e7a6db8f20314c53183a (diff)
texk/web2c: reorganize headers and CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@18865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/otps')
-rw-r--r--Build/source/texk/web2c/otps/ChangeLog5
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in5
-rw-r--r--Build/source/texk/web2c/otps/routines.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index a9c8bb57d51..25db1daa690 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Reorganize web2c headers.
+ * routines.h: #include <w2c/config.h> instead of <config.h>.
+
2010-04-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* mkocp.man, mkofm.man, otp2ocp.man, outocp.man:
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index a78c75222d5..7dbb5d7d9a4 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -76,7 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h
+CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
+ $(top_builddir)/ff-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = otp2ocp$(EXEEXT) outocp$(EXEEXT)
@@ -113,7 +114,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
diff --git a/Build/source/texk/web2c/otps/routines.h b/Build/source/texk/web2c/otps/routines.h
index 6d99dcd906f..a0e4485dc3a 100644
--- a/Build/source/texk/web2c/otps/routines.h
+++ b/Build/source/texk/web2c/otps/routines.h
@@ -23,7 +23,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <w2c/config.h>
#endif
#ifdef KPATHSEA
#include <kpathsea/config.h>