summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-09 20:41:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:56:50 -0500
commitf710a30dc4cc03100492debf860d77c4ae868514 (patch)
tree137000cf5186907a2d25b0602c50a8a474545a69 /source4/build
parentbfcaa4000e11c84fb31abe11a1631ea3c4ca4c31 (diff)
downloadsamba-f710a30dc4cc03100492debf860d77c4ae868514.tar.gz
samba-f710a30dc4cc03100492debf860d77c4ae868514.tar.bz2
samba-f710a30dc4cc03100492debf860d77c4ae868514.zip
r14097: Remove subsystem names when installing modules (they're already installed
in a subsystem-specific directory) No longer install smb.h as it only contains (internal) constants. (This used to be commit b76126628c21755bb8d30e72e3044bd1785a2447)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/makefile.pm12
2 files changed, 9 insertions, 4 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 69c8d98fc7..22130b6b7a 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,5 +1,6 @@
- sonames
- saner names for some of the .pc files
+- .pc files also when there is a public header?
- get rid of include/structs.h and include/proto.h
- add register function to smbtorture
- improve (un)install scripts (rewrite in perl?)
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 415d7321f6..8423221912 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -275,11 +275,15 @@ sub SharedLibrary($$)
push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}");
push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
- $self->{install_plugins} .= "\t\@echo Install $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
+ my $fixedname = $ctx->{NAME};
+
+ $fixedname =~ s/^$ctx->{SUBSYSTEM}_//g;
+
+ $self->{install_plugins} .= "\t\@echo Installing $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
$self->{install_plugins} .= "\t\@mkdir -p \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/\n";
- $self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
- $self->{uninstall_plugins} .= "\t\@echo Uninstall \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
- $self->{uninstall_plugins} .= "\t\@rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
+ $self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
+ $self->{uninstall_plugins} .= "\t\@echo Uninstalling \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
+ $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
}
$self->_prepare_list($ctx, "OBJ_LIST");