diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-06-03 22:01:06 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-06-03 22:01:06 +0100 |
| commit | 25b80e9cc7f74ec3df47c2ed25933065832bd7f4 (patch) | |
| tree | f2d6bd87f2bcc273a2231fd024d79d8064d46b8b | |
| parent | 18e1f3b157062e2daec877157e4868593e984656 (diff) | |
Commit two patches from RH package maintainer (#956).
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | doc/user-guide/Makefile | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -21,7 +21,7 @@ libevent='/usr/' pidfile='/var/run/bitlbee.pid' ipcsocket='' pcdir='$prefix/lib/pkgconfig' -systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64" +systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" msn=1 jabber=1 @@ -132,6 +132,8 @@ TARGET=$target ARCH=$arch CPU=$cpu +INSTALL=install -p + DESTDIR= LFLAGS= EFLAGS= diff --git a/doc/Makefile b/doc/Makefile index f8655d74..5660e23d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,8 +9,8 @@ all: install: mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/ - install -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/ - install -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/ + $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/ $(MAKE) -C user-guide $@ uninstall: diff --git a/doc/user-guide/Makefile b/doc/user-guide/Makefile index 44ff6f51..0215ede8 100644 --- a/doc/user-guide/Makefile +++ b/doc/user-guide/Makefile @@ -41,7 +41,7 @@ install: mkdir -p $(DESTDIR)$(DATADIR) chmod 0755 $(DESTDIR)$(DATADIR) rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions - install -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt + $(INSTALL) -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt uninstall: rm -f $(DESTDIR)$(DATADIR)/help.txt |