Use absolute paths instead of srcdir because libintl.h is built in the

build directory.  To pass distcheck we need to do it this way.

svn path=/trunk/yasm/; revision=179

diff --git a/modules/objfmts/dbg/Makefile.am b/modules/objfmts/dbg/Makefile.am
index 206fe1855d77638b8c6209c30528f55b0422adb3..a81e40bdd5b16438ca56a5a00429937dafc5505f 100644 (file)
--- a/modules/objfmts/dbg/Makefile.am
+++ b/modules/objfmts/dbg/Makefile.am
@@ -5,7 +5,7 @@ libobjfmt_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/modules/optimizers/basic/Makefile.am b/modules/optimizers/basic/Makefile.am
index e22223f98833bfc09beb3e271cf71db8c391900d..89686b27b841ac4e6aa56085dc9ceaef4e3568b7 100644 (file)
--- a/modules/optimizers/basic/Makefile.am
+++ b/modules/optimizers/basic/Makefile.am
@@ -5,7 +5,7 @@ liboptimizer_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/modules/optimizers/dbg/Makefile.am b/modules/optimizers/dbg/Makefile.am
index e22223f98833bfc09beb3e271cf71db8c391900d..89686b27b841ac4e6aa56085dc9ceaef4e3568b7 100644 (file)
--- a/modules/optimizers/dbg/Makefile.am
+++ b/modules/optimizers/dbg/Makefile.am
@@ -5,7 +5,7 @@ liboptimizer_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/modules/parsers/nasm/Makefile.am b/modules/parsers/nasm/Makefile.am
index 82bc7fb7df108348c6d0fe1877ed3cb7fb180729..be3998565c33cbeba5354cceb73ac47cd5bd6079 100644 (file)
--- a/modules/parsers/nasm/Makefile.am
+++ b/modules/parsers/nasm/Makefile.am
@@ -12,7 +12,7 @@ AM_LFLAGS = -Pnasm_parser_ -olex.yy.c
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/modules/preprocs/raw/Makefile.am b/modules/preprocs/raw/Makefile.am
index 5a55488038e01dcc79538c687d129610f1bc810c..1e3eb6da5dc5985150bc297a207fa80782e0b557 100644 (file)
--- a/modules/preprocs/raw/Makefile.am
+++ b/modules/preprocs/raw/Makefile.am
@@ -5,7 +5,7 @@ libpreproc_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f5e40cc8434442c28b9c32ec65a87e26df27a51..af2423003b3db71e267328b203aeddde2ed61e3a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = parsers preprocs optimizers objfmts
 
-INCLUDES = -I$(top_srcdir)/intl
+INCLUDES = -I../intl
 
 bin_PROGRAMS = yasm
 

diff --git a/src/objfmts/dbg/Makefile.am b/src/objfmts/dbg/Makefile.am
index 206fe1855d77638b8c6209c30528f55b0422adb3..a81e40bdd5b16438ca56a5a00429937dafc5505f 100644 (file)
--- a/src/objfmts/dbg/Makefile.am
+++ b/src/objfmts/dbg/Makefile.am
@@ -5,7 +5,7 @@ libobjfmt_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/src/optimizers/basic/Makefile.am b/src/optimizers/basic/Makefile.am
index e22223f98833bfc09beb3e271cf71db8c391900d..89686b27b841ac4e6aa56085dc9ceaef4e3568b7 100644 (file)
--- a/src/optimizers/basic/Makefile.am
+++ b/src/optimizers/basic/Makefile.am
@@ -5,7 +5,7 @@ liboptimizer_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/src/optimizers/dbg/Makefile.am b/src/optimizers/dbg/Makefile.am
index e22223f98833bfc09beb3e271cf71db8c391900d..89686b27b841ac4e6aa56085dc9ceaef4e3568b7 100644 (file)
--- a/src/optimizers/dbg/Makefile.am
+++ b/src/optimizers/dbg/Makefile.am
@@ -5,7 +5,7 @@ liboptimizer_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/src/parsers/nasm/Makefile.am b/src/parsers/nasm/Makefile.am
index 82bc7fb7df108348c6d0fe1877ed3cb7fb180729..be3998565c33cbeba5354cceb73ac47cd5bd6079 100644 (file)
--- a/src/parsers/nasm/Makefile.am
+++ b/src/parsers/nasm/Makefile.am
@@ -12,7 +12,7 @@ AM_LFLAGS = -Pnasm_parser_ -olex.yy.c
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g

diff --git a/src/preprocs/raw/Makefile.am b/src/preprocs/raw/Makefile.am
index 5a55488038e01dcc79538c687d129610f1bc810c..1e3eb6da5dc5985150bc297a207fa80782e0b557 100644 (file)
--- a/src/preprocs/raw/Makefile.am
+++ b/src/preprocs/raw/Makefile.am
@@ -5,7 +5,7 @@ libpreproc_a_SOURCES = \
 
 INCLUDES = \
        -I$(top_srcdir)/src     \
-       -I$(top_srcdir)/intl
+       -I../../../intl
 
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g