diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 17:13:02 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 17:13:02 +0200 |
| commit | b16a8f31ad7b6434b44e24e96b72d877a7ede356 (patch) | |
| tree | 6ba9b52ffdbb394a7143f1a08112de7c4b245f43 | |
| parent | 79190992b3820cd028c961c48bdea9b35baf13c9 (diff) | |
| download | samba-b16a8f31ad7b6434b44e24e96b72d877a7ede356.tar.gz samba-b16a8f31ad7b6434b44e24e96b72d877a7ede356.tar.bz2 samba-b16a8f31ad7b6434b44e24e96b72d877a7ede356.zip | |
Fix location of included popt files for systems that don't have popt.
| -rw-r--r-- | source4/Makefile | 2 | ||||
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/Makefile b/source4/Makefile index 91390d833f..7a5ec4c0d0 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -8,7 +8,7 @@ default: all include mkconfig.mk -pidldir := $(srcdir)/pidl +pidldir := $(srcdir)/../pidl BASEDIR = $(prefix) TORTUREDIR = $(libdir)/torture diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index d98910cee3..cde0a053ca 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -255,7 +255,7 @@ fi if test x"${PIDL_TESTS_SKIP}" = x"yes"; then echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes" elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then - for f in $samba4srcdir/pidl/tests/*.pl; do + for f in $samba4srcdir/../pidl/tests/*.pl; do plantest "pidl.`basename $f .pl`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl done else |