philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the install* targets in the Makefiles to honour DESTDIR. This

Browse Source 
makes packaging the client for .deb and .rpm easier.

Reported separately by nyet and VICODAN.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@164 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-05-08 14:34:25 +00:00
parent cb0c2aabc2
commit 7ee26d4ed3
26 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2c01]
* Add DESTDIR support to build system, to ease rpm and deb packaging.
Reported separately by nyet and VICODAN. (caf)
* Fix /detach and wserv with IPv6 enabled. (caf, snadge, packet)
* Make default for NICK_COMPLETION_CHAR explicit. (caf)

46
Makefile.in
View File

@@ -209,7 +209,7 @@ dll: .config.h $(srcdir)/Makefile dll/Makefile dll/dummy
installdll: $(srcdir)/Makefile dll/Makefile installdirs dll
cd dll \
&& $(MAKE) install
&& $(MAKE) 'DESTDIR=$(DESTDIR)' install
installdll_local: $(srcdir)/Makefile dll/Makefile
cd dll \
@@ -218,19 +218,19 @@ installdll_local: $(srcdir)/Makefile dll/Makefile
installhelp: installdirs
cd $(top_srcdir) \
&& $(INSTALL_HELP_CMD)
(find $(HELPDIR) -type f ! -name '*.bz2' ! -name '*.gz' -name '*' | \
(find $(DESTDIR)$(HELPDIR) -type f ! -name '*.bz2' ! -name '*.gz' | \
(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
installbin: installirc @INSTALL_EXTRAS@
installirc: installdirs $(_VERSION_)
$(INSTALL) source/$(_VERSION_)$(EXEEXT) $(bindir)/$(VERSION)$(EXEEXT)
$(RM) $(INSTALL_IRC)
$(LN) $(bindir)/$(VERSION)$(EXEEXT) $(INSTALL_IRC)
$(INSTALL_DATA) $(top_srcdir)/BitchX.help $(IRCLIB)/$(DEFAULT_BITCHX_HELP_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.ircnames $(IRCLIB)/$(DEFAULT_BITCHX_IRCNAME_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.quit $(IRCLIB)/$(DEFAULT_BITCHX_QUIT_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.reasons $(IRCLIB)/$(DEFAULT_BITCHX_KICK_FILE)
$(INSTALL) source/$(_VERSION_)$(EXEEXT) $(DESTDIR)$(bindir)/$(VERSION)$(EXEEXT)
$(RM) $(DESTDIR)$(INSTALL_IRC)
$(LN) $(DESTDIR)$(bindir)/$(VERSION)$(EXEEXT) $(DESTDIR)$(INSTALL_IRC)
$(INSTALL_DATA) $(top_srcdir)/BitchX.help $(DESTDIR)$(IRCLIB)/$(DEFAULT_BITCHX_HELP_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.ircnames $(DESTDIR)$(IRCLIB)/$(DEFAULT_BITCHX_IRCNAME_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.quit $(DESTDIR)$(IRCLIB)/$(DEFAULT_BITCHX_QUIT_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.reasons $(DESTDIR)$(IRCLIB)/$(DEFAULT_BITCHX_KICK_FILE)
$(WINNT_INSTALL)
install_local: all local_installdirs installdll_local
@@ -251,28 +251,28 @@ scr-bx: .config.h $(srcdir)/source/scr-bx.c $(srcdir)/source/term.c $(srcdir)/Ma
&& $(MAKE) scr-bx
installwserv: installdirs wserv
$(INSTALL) source/wserv $(INSTALL_WSERV)
$(INSTALL) source/wserv $(DESTDIR)$(INSTALL_WSERV)
installscr-bx: installdirs scr-bx
$(INSTALL) source/scr-bx $(INSTALL_SCRBX)
$(INSTALL) source/scr-bx $(DESTDIR)$(INSTALL_SCRBX)
installscript: installdirs
-@( \
if test -d $(top_srcdir)/script; then \
cd $(top_srcdir)/script; \
for i in *; do \
if test "$$i" = "bxglobal" -a -f $(INSTALL_SCRIPT)/bxglobal; then \
if test "$$i" = "bxglobal" -a -f $(DESTDIR)$(INSTALL_SCRIPT)/bxglobal; then \
if test -f bxglobal; then \
$(INSTALL_DATA) $(INSTALL_SCRIPT)/bxglobal $(INSTALL_SCRIPT)/bxglobal.old; \
$(INSTALL_DATA) bxglobal $(INSTALL_SCRIPT); \
$(INSTALL_DATA) $(DESTDIR)$(INSTALL_SCRIPT)/bxglobal $(DESTDIR)$(INSTALL_SCRIPT)/bxglobal.old; \
$(INSTALL_DATA) bxglobal $(DESTDIR)$(INSTALL_SCRIPT); \
fi; \
else \
if test "$$i" != "CVS"; then \
$(INSTALL_DATA) $$i $(INSTALL_SCRIPT); \
$(INSTALL_DATA) $$i $(DESTDIR)$(INSTALL_SCRIPT); \
fi; \
fi; \
done; \
chmod -x $(INSTALL_SCRIPT)/*; \
chmod -x $(DESTDIR)$(INSTALL_SCRIPT)/*; \
fi; \
)
@@ -282,13 +282,13 @@ installtranslation: installdirs
cd $(top_srcdir)/translation; \
for i in *; do \
if test "$$i" != "CVS"; then \
$(INSTALL_DATA) $$i $(TRANSLATION_PATH); \
$(INSTALL_DATA) $$i $(DESTDIR)$(TRANSLATION_PATH); \
fi; \
done; \
chmod -x $(TRANSLATION_PATH)/*; \
chmod -x $(DESTDIR)$(TRANSLATION_PATH)/*; \
fi; \
)
(find $(TRANSLATION_PATH) -type f ! -name '*.bz2' ! -name '*.gz' -name '*' | \
(find $(DESTDIR)$(TRANSLATION_PATH) -type f ! -name '*.bz2' ! -name '*.gz' | \
(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
installman: installdirs
@@ -297,16 +297,18 @@ installman: installdirs
cd $(top_srcdir)/doc; \
for i in BitchX.1; do \
if test -f $$i; then \
$(INSTALL_DATA) $$i $(mandir)/man1; \
$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \
fi; \
done; \
fi; \
)
(find $(mandir)/man1/BitchX.1 -type f ! -name '*.bz2' ! -name '*.gz' -name '*' | \
(find $(DESTDIR)$(mandir)/man1/BitchX.1 -type f ! -name '*.bz2' ! -name '*.gz' | \
(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
installdirs:
umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR)
umask 022 && $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(IRCLIB) \
$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(TRANSLATION_PATH) $(DESTDIR)$(INSTALL_SCRIPT) \
$(DESTDIR)$(HELPDIR)
local_installdirs:
umask 022; $(top_srcdir)/mkinstalldirs $(local_dir)/bin $(DEFAULT_CTOOLZ_DIR) $(DEFAULT_CTOOLZ_DIR)/plugins $(DEFAULT_CTOOLZ_DIR)/logs

8
configure.in
View File

@@ -912,7 +912,7 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
INSTALL_WSERV="\$(IRCLIB)/wserv\$(EXEEXT)"
INSTALL_SCRBX="\$(IRCLIB)/scr-bx\$(EXEEXT)"
INSTALL_SCRIPT="\$(IRCLIB)/script"
INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(HELPDIR)"
INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(DESTDIR)\$(HELPDIR)"
PLUGINDIR="\$(IRCLIB)/plugins"
DEFAULT_CTOOLZ_DIR="/PROGRA~1/BitchX"
DEFAULT_MSGLOGFILE="BitchX.awy"
@@ -921,7 +921,7 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
DEFAULT_BITCHX_KICK_FILE="BitchX.kck"
DEFAULT_BITCHX_QUIT_FILE="BitchX.qt"
DEFAULT_BITCHX_IRCNAME_FILE="BitchX.nam"
WINNT_INSTALL="\$(INSTALL_DATA) \$(top_srcdir)/doc/BitchX.ico \$(IRCLIB); \$(INSTALL_DATA) \$(top_srcdir)/doc/BitchX.bat \$(IRCLIB); \$(INSTALL_DATA) \$(top_srcdir)/doc/bx-rc \$(IRCLIB); \$(MV) \$(IRCLIB)/\$(VERSION)\$(EXEEXT) \$(IRCLIB)/\$(_VERSION_)\$(EXEEXT); \$(RM) \$(IRCLIB)/\$(_VERSION_).old"
WINNT_INSTALL="\$(INSTALL_DATA) \$(top_srcdir)/doc/BitchX.ico \$(DESTDIR)\$(IRCLIB); \$(INSTALL_DATA) \$(top_srcdir)/doc/BitchX.bat \$(DESTDIR)\$(IRCLIB); \$(INSTALL_DATA) \$(top_srcdir)/doc/bx-rc \$(DESTDIR)\$(IRCLIB); \$(MV) \$(DESTDIR)\$(IRCLIB)/\$(VERSION)\$(EXEEXT) \$(DESTDIR)\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT); \$(RM) \$(DESTDIR)\$(IRCLIB)/\$(_VERSION_).old"
HINT_FILE="BitchX.hnt"
mandir="\$(IRCLIB)"
else
@@ -933,7 +933,7 @@ else
INSTALL_WSERV="\$(IRCLIB)/wserv\$(EXEEXT)"
INSTALL_SCRBX="\${bindir}/scr-bx\$(EXEEXT)"
INSTALL_SCRIPT="\$(IRCLIB)/script"
INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(HELPDIR)"
INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(DESTDIR)\$(HELPDIR)"
PLUGINDIR="\$(IRCLIB)/plugins"
DEFAULT_CTOOLZ_DIR="~/.BitchX"
DEFAULT_MSGLOGFILE="BitchX.away"
@@ -1032,7 +1032,7 @@ AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h
AC_OUTPUT
echo
echo BitchX \(c\) 1996-2002 Colten Edwards
echo BitchX \(c\) 1996-2012 Colten Edwards et al
echo ----------------------------------------------------------
echo
echo The configuration script has finished. You should look through

6
dll/Makefile.in
View File

@@ -196,19 +196,19 @@ dllinit.o:
)
install: all
$(INSTALL) -d $(PLUGINDIR)
$(INSTALL) -d $(DESTDIR)$(PLUGINDIR)
@( \
makeflags=$$2; \
target="$@"; \
list="$(PLUGINS)"; \
for subdir in $$list; do \
(cd $$subdir && $(MAKE) $$target) \
(cd $$subdir && $(MAKE) 'DESTDIR=$(DESTDIR)' $$target) \
|| case "$$makeflags" in *=*) exit 1;; *k*) ;; *) exit 1;; esac; \
done; \
)
@( \
if test x"$(PLUGINS)" != x""; then \
strip --strip-unneeded $(PLUGINDIR)/*$(SHLIB_SUFFIX) || :; \
strip --strip-unneeded $(DESTDIR)$(PLUGINDIR)/*$(SHLIB_SUFFIX) || :; \
echo Your plugins [$(PLUGINS)] are now located in $(PLUGINDIR);\
fi; \
)

2
dll/abot/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/acro/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/aim/Makefile.in
View File

@@ -201,4 +201,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/amp/Makefile.in
View File

@@ -193,7 +193,7 @@ depend:
gcc -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c > .depend
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
audio.o: audio.c ../../include/irc.h ../../include/defs.h \
../../include/config.h ../../include/../.config.h \

2
dll/arcfour/Makefile.in
View File

@@ -180,4 +180,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/autocycle/Makefile.in
View File

@@ -180,4 +180,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/blowfish/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/cavlink/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/cdrom/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/encrypt/Makefile.in
View File

@@ -178,4 +178,4 @@ distclean: clean
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/europa/Makefile.in
View File

@@ -182,4 +182,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/fserv/Makefile.in
View File

@@ -176,4 +176,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

4
dll/hint/Makefile.in
View File

@@ -177,5 +177,5 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(srcdir)/BitchX.hints $(PLUGINDIR)/@HINT_FILE@
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
$(INSTALL) $(srcdir)/BitchX.hints $(DESTDIR)$(PLUGINDIR)/@HINT_FILE@

2
dll/identd/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/nap/Makefile.in
View File

@@ -198,4 +198,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/nicklist/Makefile.in
View File

@@ -180,4 +180,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/pkga/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/possum/Makefile.in
View File

@@ -183,4 +183,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/qbx/Makefile.in
View File

@@ -176,4 +176,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/qmail/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/wavplay/Makefile.in
View File

@@ -177,4 +177,4 @@ distclean: clean
$(RM) Makefile
install:
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

2
dll/xmms/Makefile.in
View File

@@ -179,4 +179,4 @@ distclean: clean
$(RM) Makefile
install: all
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)