summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-12-28 13:53:04 +0000
committerNorbert Preining <preining@logic.at>2007-12-28 13:53:04 +0000
commite6d9f0a194abe738455475bdf03bc3d1fc75c74f (patch)
treef0e8295fecd6727d4c4782ad968fbc677eb2991e
parente2102c1f0858d1febfffef6fe90c6f5acb173021 (diff)
fix lzma build breakage
git-svn-id: svn://tug.org/texlive/trunk@5968 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/lzma-utils/src/lzma/Makefile.am2
-rw-r--r--Build/source/utils/lzma-utils/src/lzma/Makefile.in2
-rw-r--r--Build/source/utils/lzma-utils/src/lzmadec/Makefile.am2
-rw-r--r--Build/source/utils/lzma-utils/src/lzmadec/Makefile.in4
-rw-r--r--Build/source/utils/lzma-utils/src/lzmainfo/Makefile.am2
-rw-r--r--Build/source/utils/lzma-utils/src/lzmainfo/Makefile.in4
6 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/utils/lzma-utils/src/lzma/Makefile.am b/Build/source/utils/lzma-utils/src/lzma/Makefile.am
index ff19d581419..95dcc42d956 100644
--- a/Build/source/utils/lzma-utils/src/lzma/Makefile.am
+++ b/Build/source/utils/lzma-utils/src/lzma/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = @SDK_CXXFLAGS@ -I../ -I../sdk -I../sdk/7zip
+AM_CXXFLAGS = @SDK_CXXFLAGS@ -I@top_srcdir@/src -I@top_srcdir@/src/sdk -I@top_srcdir@/src/sdk/7zip
# Avoid dependency on libstdc++:
#AM_LDFLAGS = -lsupc++ -static-libgcc
diff --git a/Build/source/utils/lzma-utils/src/lzma/Makefile.in b/Build/source/utils/lzma-utils/src/lzma/Makefile.in
index a7f72c21bce..cff1017000c 100644
--- a/Build/source/utils/lzma-utils/src/lzma/Makefile.in
+++ b/Build/source/utils/lzma-utils/src/lzma/Makefile.in
@@ -189,7 +189,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CXXFLAGS = @SDK_CXXFLAGS@ -I../ -I../sdk -I../sdk/7zip
+AM_CXXFLAGS = @SDK_CXXFLAGS@ -I@top_srcdir@/src -I@top_srcdir@/src/sdk -I@top_srcdir@/src/sdk/7zip
lzma_SOURCES = lzmp.cpp Exception.h \
../sdk/Common/C_FileIO.cpp \
../sdk/Common/CRC.cpp \
diff --git a/Build/source/utils/lzma-utils/src/lzmadec/Makefile.am b/Build/source/utils/lzma-utils/src/lzmadec/Makefile.am
index f8eca5d12fa..76d0ed6adf4 100644
--- a/Build/source/utils/lzma-utils/src/lzmadec/Makefile.am
+++ b/Build/source/utils/lzma-utils/src/lzmadec/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = lzmadec
lzmadec_SOURCES = lzmadec.c
-lzmadec_LDADD = @top_srcdir@/src/liblzmadec/liblzmadec.la
+lzmadec_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la
AM_CFLAGS = -I@top_srcdir@/src/liblzmadec
AM_LDFLAGS = -static
diff --git a/Build/source/utils/lzma-utils/src/lzmadec/Makefile.in b/Build/source/utils/lzma-utils/src/lzmadec/Makefile.in
index 8b393d424c2..3878f72712e 100644
--- a/Build/source/utils/lzma-utils/src/lzmadec/Makefile.in
+++ b/Build/source/utils/lzma-utils/src/lzmadec/Makefile.in
@@ -48,7 +48,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_lzmadec_OBJECTS = lzmadec.$(OBJEXT)
lzmadec_OBJECTS = $(am_lzmadec_OBJECTS)
-lzmadec_DEPENDENCIES = @top_srcdir@/src/liblzmadec/liblzmadec.la
+lzmadec_DEPENDENCIES = @top_builddir@/src/liblzmadec/liblzmadec.la
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -177,7 +177,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lzmadec_SOURCES = lzmadec.c
-lzmadec_LDADD = @top_srcdir@/src/liblzmadec/liblzmadec.la
+lzmadec_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la
AM_CFLAGS = -I@top_srcdir@/src/liblzmadec
AM_LDFLAGS = -static
dist_man_MANS = lzmadec.1
diff --git a/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.am b/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.am
index 458a99bc31c..173600a60d7 100644
--- a/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.am
+++ b/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = lzmainfo
lzmainfo_SOURCES = lzmainfo.c
-lzmainfo_LDADD = @top_srcdir@/src/liblzmadec/liblzmadec.la
+lzmainfo_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la
AM_CFLAGS = -I@top_srcdir@/src/liblzmadec
AM_LDFLAGS = -static
diff --git a/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.in b/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.in
index 1676122d8dd..77878d9bfbe 100644
--- a/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.in
+++ b/Build/source/utils/lzma-utils/src/lzmainfo/Makefile.in
@@ -48,7 +48,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_lzmainfo_OBJECTS = lzmainfo.$(OBJEXT)
lzmainfo_OBJECTS = $(am_lzmainfo_OBJECTS)
-lzmainfo_DEPENDENCIES = @top_srcdir@/src/liblzmadec/liblzmadec.la
+lzmainfo_DEPENDENCIES = @top_builddir@/src/liblzmadec/liblzmadec.la
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -177,7 +177,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lzmainfo_SOURCES = lzmainfo.c
-lzmainfo_LDADD = @top_srcdir@/src/liblzmadec/liblzmadec.la
+lzmainfo_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la
AM_CFLAGS = -I@top_srcdir@/src/liblzmadec
AM_LDFLAGS = -static
dist_man_MANS = lzmainfo.1