From: Bruno Haible Date: Wed, 2 Aug 2006 16:12:44 +0000 (+0000) Subject: Update directory pathnames. X-Git-Tag: 0.16.x-branchpoint~229 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8928be55e6667ec295b8ac04f07235c66c31eaf;p=thirdparty%2Fgettext.git Update directory pathnames. --- diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index d328c9d43..be18c054d 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,9 @@ +2006-08-02 Bruno Haible + + * lang-c: Replace ../lib with ../gnulib-lib. + * lang-c++: Likewise. + * lang-objc: Likewise. + 2006-07-30 Bruno Haible * Makefile.am (AM_CPPFLAGS, *_LDADD*): Replace ../lib with diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c index e341b9990..32c799312 100755 --- a/gettext-tools/tests/lang-c +++ b/gettext-tools/tests/lang-c @@ -49,7 +49,7 @@ tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}" # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in # ${CFLAGS} or ${CPPFLAGS}. -${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/lib ../lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.c ${LTLIBINTL} \ +${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.c ${LTLIBINTL} \ || exit 1 tmpfiles="$tmpfiles prog.pot" diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index af96ecf88..3f6a2cbeb 100755 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -68,9 +68,9 @@ tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}" # Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in # ${CXXFLAGS} or ${CPPFLAGS}. -${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \ +${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \ || exit 1 -${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../lib/libgettextlib.la ${LTLIBINTL} \ +${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \ || exit 1 tmpfiles="$tmpfiles prog.pot" diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc index 16e3a77fc..e292b5439 100755 --- a/gettext-tools/tests/lang-objc +++ b/gettext-tools/tests/lang-objc @@ -65,7 +65,7 @@ tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}" # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in # ${CFLAGS} or ${CPPFLAGS}. -${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/lib ../lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.m ${LTLIBINTL} \ +${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.m ${LTLIBINTL} \ || exit 1 tmpfiles="$tmpfiles prog.pot"