From: Michael Adam Date: Sun, 6 Jul 2008 18:38:03 +0000 (+0200) Subject: build: fix uninstalllibnetapi target - handle symlink libnetapi.so X-Git-Tag: samba-3.3.0pre1~647 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21b6164795344cea45161bc01828ec1127b5b6ab;p=thirdparty%2Fsamba.git build: fix uninstalllibnetapi target - handle symlink libnetapi.so and use the defined variables instead of hardcoded bits. Also move the target into the libnetapi section (forgotten last time). Michael --- diff --git a/source/Makefile.in b/source/Makefile.in index 1798a72657f..e401e000b33 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1805,6 +1805,12 @@ installlibnetapi:: installdirs libnetapi @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include +uninstalllibnetapi:: + -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` + -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET_SONAME)` + -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_STATIC_TARGET)` + -rm -f $(DESTDIR)${prefix}/include/netapi.h + #------------------------------------------------------------------- # @@ -2431,11 +2437,6 @@ uninstalllibaddns:: -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libaddns.@SHLIBEXT@ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libaddns.a -uninstalllibnetapi:: - -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libnetapi.@SHLIBEXT@ - -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libnetapi.a - -rm -f $(DESTDIR)${prefix}/include/netapi.h - uninstallpammodules:: @for module in $(PAM_MODULES); do \ echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \