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 | fd18356fe2c59877860383219b6e71f182aec1fe (patch) | |
| tree | 28e4dc60fe54b7383f62cd9131d120d59168cfe7 | |
| parent | 1d9d49c9181b3d798130f5bd64560fcb1b369b13 (diff) | |
| download | samba-fd18356fe2c59877860383219b6e71f182aec1fe.tar.gz | |
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
| -rw-r--r-- | source/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 4930bb97b4e..4769604243b 100644 --- a/source/Makefile.in +++ b/source/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 |