diff options
| author | Gerald Carter <jerry@samba.org> | 2005-10-11 16:12:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:55 -0500 |
| commit | 47e297bc8de7bed9de5fc7ce2456c1d414301eca (patch) | |
| tree | 391a43594ca3c3f0bcb782965281fedc5772e698 | |
| parent | 9e1cf0d51cd7487fff809dc3756fdac0c1efd9b3 (diff) | |
| download | samba-47e297bc8de7bed9de5fc7ce2456c1d414301eca.tar.gz samba-47e297bc8de7bed9de5fc7ce2456c1d414301eca.tar.bz2 samba-47e297bc8de7bed9de5fc7ce2456c1d414301eca.zip | |
r10904: build patches from Marc Balmer <marc@msys.ch> when builddir!=srcdir
(This used to be commit b7fc4045185f2f0ec27aa72656163e9249ad7b85)
| -rw-r--r-- | source3/Makefile.in | 8 | ||||
| -rwxr-xr-x | source3/script/installman.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4310f51bd5..abb7085ff4 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -811,24 +811,24 @@ test: all torture dynconfig.o: dynconfig.c Makefile @echo Compiling $*.c - @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c dynconfig.c -o $@ + @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/dynconfig.c -o $@ dynconfig.@PICSUFFIX@: dynconfig.c Makefile @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c dynconfig.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/dynconfig.c -o $@ @BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.@PICSUFFIX@$$%.o%'` $@ lib/version.o: lib/version.c include/version.h @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/lib/version.c -o $@ lib/version.@PICSUFFIX@: lib/version.c include/version.h @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/lib/version.c -o $@ @BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.@PICSUFFIX@$$%.o%'` $@ smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 9cd9100839..6278012635 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -13,7 +13,7 @@ if [ $# -ge 4 ] ; then GROFF=$4 # sh cmd line, including options fi -if test ! -d ../docs/manpages; then +if test ! -d $SRCDIR../docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi |