diff options
| author | Tim Potter <tpot@samba.org> | 2003-10-09 05:59:16 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-10-09 05:59:16 +0000 |
| commit | 92ac1e11896a9e20c16209a85467ccbdd9eba3d9 (patch) | |
| tree | 251e9952feefd57abf72f744e65f14db0d44b050 /source3 | |
| parent | 70c8d35b24284902de87d4e74257e15dd6ec63fc (diff) | |
| download | samba-92ac1e11896a9e20c16209a85467ccbdd9eba3d9.tar.gz samba-92ac1e11896a9e20c16209a85467ccbdd9eba3d9.tar.bz2 samba-92ac1e11896a9e20c16209a85467ccbdd9eba3d9.zip | |
Merge from 3.0:
>Explicitly initialise the value of AR for vendor makes that don't do
>this (HPUX 11). Currently it's initialised to 'ar' but this may have
>to be changed if any systems pop up that have archivers that aren't
>named 'ar'. Closes bug #552.
>fixed for /sbin/mount.smbfs link when using $DESTDIR; bug 525
(This used to be commit fd18356fe2c59877860383219b6e71f182aec1fe)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4930bb97b4..4769604243 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -18,6 +18,7 @@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ EXEEXT=@EXEEXT@ LDFLAGS=@LDFLAGS@ +AR=@AR@ LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ AWK=@AWK@ @@ -1182,8 +1183,8 @@ installservers: all installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) installbin: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS) installmodules: modules installdirs |