svn commit: samba r9461 - in branches/SAMBA_4_0: packaging/debian source/heimdal_build source/pidl

jelmer at samba.org jelmer at samba.org
Sun Aug 21 23:56:47 GMT 2005


Author: jelmer
Date: 2005-08-21 23:56:47 +0000 (Sun, 21 Aug 2005)
New Revision: 9461

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

Log:
Couple of very small fixes.

Modified:
   branches/SAMBA_4_0/packaging/debian/rules
   branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl
   branches/SAMBA_4_0/source/pidl/
   branches/SAMBA_4_0/source/pidl/pidl


Changeset:
Modified: branches/SAMBA_4_0/packaging/debian/rules
===================================================================
--- branches/SAMBA_4_0/packaging/debian/rules	2005-08-21 23:30:17 UTC (rev 9460)
+++ branches/SAMBA_4_0/packaging/debian/rules	2005-08-21 23:56:47 UTC (rev 9461)
@@ -24,7 +24,7 @@
 		--with-syslog \
 		--with-readline \
 		--with-ldap 
-	cd $(SOURCEPATH)/build/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
+	cd $(SOURCEPATH)/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
 	touch $@
 
 build: configure
@@ -32,7 +32,7 @@
 	$(MAKE) -C $(SOURCEPATH) proto 
 	-$(MAKE) -C $(SOURCEPATH) pch
 	$(MAKE) -C $(SOURCEPATH) all
-	$(MAKE) -C $(SOURCEPATH)/build/pidl all
+	$(MAKE) -C $(SOURCEPATH)/pidl all
 	touch $@
 
 clean:
@@ -65,7 +65,7 @@
 	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
 	mkdir -p $(CURDIR)/debian/tmp/etc/samba4
 	cp $(CURDIR)/debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
-	$(MAKE) -C $(SOURCEPATH)/build/pidl install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-arch: build install
 	dh_testdir -a

Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl	2005-08-21 23:30:17 UTC (rev 9460)
+++ branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl	2005-08-21 23:56:47 UTC (rev 9461)
@@ -40,7 +40,7 @@
 }
 close(IN);
 print $prefix."_clean: \n";
-print "\t\@echo \"Deleting ASN1 ouput files generated from $file\"";
+print "\t\@echo \"Deleting ASN1 output files generated from $file\"";
 print "\n\t\@rm -f $header";
 foreach $c_file (@c_files) {
     print "\n\t\@rm -f $c_file";


Property changes on: branches/SAMBA_4_0/source/pidl
___________________________________________________________________
Name: svn:ignore
   - *.pidl
blib
pm_to_blib
Makefile
Makefile.old

   + *.pidl
blib
pm_to_blib
Makefile
Makefile.old
pidl.1
pidl.1.html


Modified: branches/SAMBA_4_0/source/pidl/pidl
===================================================================
--- branches/SAMBA_4_0/source/pidl/pidl	2005-08-21 23:30:17 UTC (rev 9460)
+++ branches/SAMBA_4_0/source/pidl/pidl	2005-08-21 23:56:47 UTC (rev 9461)
@@ -347,6 +347,9 @@
 	}
 }
 
-foreach my $filename (@ARGV) {
-	process_file($filename);
+if (scalar(@ARGV) == 0) {
+	print "pidl: no input files\n";
+	exit(0);
 }
+
+process_file($_) foreach (@ARGV);



More information about the samba-cvs mailing list