samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r10905 - in branches/tmp/SAMBA_3_0_20B/source: . scrip

Subject: svn commit: samba r10905 - in branches/tmp/SAMBA_3_0_20B/source: . script
From:
Date: Tue, 11 Oct 2005 16:12:49 +0000 GMT
Author: jerry
Date: 2005-10-11 16:12:48 +0000 (Tue, 11 Oct 2005)
New Revision: 10905

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10905

Log:
build patches from Marc Balmer <marc@xxxxxxx> when builddir!=srcdir
Modified:
   branches/tmp/SAMBA_3_0_20B/source/Makefile.in
   branches/tmp/SAMBA_3_0_20B/source/script/installman.sh


Changeset:
Modified: branches/tmp/SAMBA_3_0_20B/source/Makefile.in
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/Makefile.in       2005-10-11 16:12:40 UTC 
(rev 10904)
+++ branches/tmp/SAMBA_3_0_20B/source/Makefile.in       2005-10-11 16:12:48 UTC 
(rev 10905)
@@ -785,24 +785,24 @@
 
 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

Modified: branches/tmp/SAMBA_3_0_20B/source/script/installman.sh
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/script/installman.sh      2005-10-11 
16:12:40 UTC (rev 10904)
+++ branches/tmp/SAMBA_3_0_20B/source/script/installman.sh      2005-10-11 
16:12:48 UTC (rev 10905)
@@ -13,7 +13,7 @@
   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

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r10905 - in branches/tmp/SAMBA_3_0_20B/source: . script, jerry <=