RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 30-Jun-2010 17:27:17
Branch: HEAD Handle: 2010063015271601
Modified files:
popt Makefile.am test1.c
popt/auto Makefile.am
Log:
Fixed VPATH building with arbitrary directory structure
make distcheck worked before just for luck.
Summary:
Revision Changes Path
1.65 +1 -1 popt/Makefile.am
1.5 +1 -1 popt/auto/Makefile.am
1.49 +9 -0 popt/test1.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/Makefile.am
============================================================================
$ cvs diff -u -r1.64 -r1.65 Makefile.am
--- popt/Makefile.am 29 Jun 2010 10:47:57 -0000 1.64
+++ popt/Makefile.am 30 Jun 2010 15:27:17 -0000 1.65
@@ -26,7 +26,7 @@
test2_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
-TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
+TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir)
testpoptrc="$(top_srcdir)/test-poptrc" PATH=.:../src:$$PATH \
$(SHELL)
TESTS = $(top_builddir)/testit.sh
@@ .
patch -p0 <<'@@ .'
Index: popt/auto/Makefile.am
============================================================================
$ cvs diff -u -r1.4 -r1.5 Makefile.am
--- popt/auto/Makefile.am 29 Jun 2010 10:47:58 -0000 1.4
+++ popt/auto/Makefile.am 30 Jun 2010 15:27:16 -0000 1.5
@@ -8,5 +8,5 @@
if HAVE_API_SANITY_AUTOTEST
check-local:
-[ -d tests ] && ${API_SANITY_AUTOTEST} -l popt -d desc -clean
- -${API_SANITY_AUTOTEST} -l popt -d desc -st types -gen -build -run
+ -${API_SANITY_AUTOTEST} -l popt -d desc -st $(top_srcdir)/auto/types
-gen -build -run
endif HAVE_API_SANITY_AUTOTEST
@@ .
patch -p0 <<'@@ .'
Index: popt/test1.c
============================================================================
$ cvs diff -u -r1.48 -r1.49 test1.c
--- popt/test1.c 17 Jun 2010 17:15:28 -0000 1.48
+++ popt/test1.c 30 Jun 2010 15:27:17 -0000 1.49
@@ -270,8 +270,17 @@
optCon = poptGetContext("test1", argc, argv, options, 0);
/*...@=temptrans@*/
(void) poptReadConfigFile(optCon, "./test-poptrc");
+#ifdef HAVE_STDLIB_H
+ char * testpoptrc;
+ testpoptrc = getenv ("testpoptrc");
+ if (testpoptrc != NULL )
+ (void) poptReadConfigFile(optCon, testpoptrc);
+ else
+ printf("something go wrong\n");
+#else
/* XXXX: make distcheck succed : test1 is in popt-<version>/_build */
(void) poptReadConfigFile(optCon, "../../test-poptrc");
+#endif
(void) poptReadDefaultConfig(optCon, 1);
poptSetExecPath(optCon, ".", 1);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
