At file:///home/jelmer/bzr.samba/4.0-debian/
------------------------------------------------------------
revno: 11335
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 22:51:37 +0100
message:
Merge upstream
modified:
source/main.mk svn-v2:[EMAIL PROTECTED]
------------------------------------------------------------
revno: 11321.1.415
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 21:47:57 +0000
message:
Don't install static libs, they can't be used anyway.
------------------------------------------------------------
revno: 11321.1.414.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 22:46:33 +0100
message:
Don't install static libs, they can't be used anyway.
=== modified file 'source/main.mk'
--- a/source/main.mk 2007-03-13 14:49:19 +0000
+++ b/source/main.mk 2007-03-13 21:51:37 +0000
@@ -140,7 +140,7 @@
installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs
@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR)
"$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS)
- @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR)
"$(STLIBEXT)" $(STATIC_LIBS)
+ [EMAIL PROTECTED](SHELL) $(srcdir)/script/installlib.sh
$(DESTDIR)$(LIBDIR) "$(STLIBEXT)" $(STATIC_LIBS)
installheader: headers installdirs
@srcdir=$(srcdir) builddir=$(builddir) $(PERL)
$(srcdir)/script/installheader.pl $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS)
$(DEFAULT_HEADERS)
@@ -174,7 +174,7 @@
uninstalllib:
@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR)
$(SHARED_LIBS)
- @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR)
$(STATIC_LIBS)
+ [EMAIL PROTECTED](SHELL) $(srcdir)/script/uninstalllib.sh
$(DESTDIR)$(LIBDIR) $(STATIC_LIBS)
uninstallheader:
@$(SHELL) $(srcdir)/script/uninstallheader.sh $(DESTDIR)$(INCLUDEDIR)
$(PUBLIC_HEADERS)
