From 274d2f5b4a8b62dc2b2bbffbc9c2cd11db860bd8 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 1 Mar 2009 02:43:43 +0000 Subject: [PATCH] fixed bug #25672, patch #6182 by adding DESTDIR support to Makefile.in --- ChangeLog | 8 ++++++-- Makefile.in | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4a6122..7d98a83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ ChangeLog for XBoard/WinBoard -* 02/28/2009 APersaud: fixed missing datarootdir in Makefile.in -> autoconf -> new configure script +* 2009-02-28 anonymous (tiny change) + added DESTDIR support to Makefile.in; similar patch also provided by Ali Polatel + patch #6182; bug #25672 -* 02/28/2009 APersaud: fixed an error in the parser. This should fix bug #22812. +* 2009-02-28 APersaud: fixed missing datarootdir in Makefile.in -> autoconf -> new configure script + +* 2009-02-28 APersaud: fixed an error in the parser. This should fix bug #22812. * 06/12/2005: bugfix some more possible buffer overflows. diff --git a/Makefile.in b/Makefile.in index 263479f..ce825d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,29 +66,41 @@ default: xboard pot zic2xpm all: default pseudosource info FAQ html dvi ps install: installdirs default - $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard - $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm - $(INSTALL_PROGRAM) cmail $(bindir)/cmail - $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard - $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) - $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) - $(INSTALL_DATA) xboard.info $(infodir)/xboard.info + $(INSTALL_PROGRAM) -s xboard $(DESTDIR)$(bindir)/xboard + $(INSTALL_PROGRAM) -s zic2xpm $(DESTDIR)$(bindir)/zic2xpm + $(INSTALL_PROGRAM) cmail $(DESTDIR)$(bindir)/cmail + $(INSTALL_PROGRAM) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard + $(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext) + $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext) + $(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info (cd po && $(MAKE) $@) -PATH=$$PATH:/sbin:/usr/sbin install-info \ - $(infodir)/xboard.info $(infodir)/dir + $(DESTDIR)$(infodir)/xboard.info $(DESTDIR)$(infodir)/dir installdirs: mkinstalldirs - $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir) + if [ -n "$(DESTDIR)" ] ; then \ + if [ 0 == `echo $(DESTDIR) | grep -c "^/"` ] ; then \ + echo "DESTDIR must be an absolute path name"; \ + exit 1 ; \ + fi ; \ + fi ; + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) $(DESTDIR)$(man6dir) $(DESTDIR)$(infodir) uninstall: - rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard - rm -f $(bindir)/zic2xpm - rm -f $(man6dir)/xboard$(man6ext) $(man6dir)/cmail$(man6ext) - rm -f $(man6dir)/zic2xpm$(man6ext) - rm -f $(infodir)/xboard.info + if [ -n "$(DESTDIR)" ] ; then \ + if [ 0 == `echo $(DESTDIR) | grep -c "^/"` ] ; then \ + echo "DESTDIR must be an absolute path name"; \ + exit 1 ; \ + fi ; \ + fi ; + rm -f $(DESTDIR)$(bindir)/xboard $(DESTDIR)$(bindir)/cmail $(DESTDIR)$(bindir)/pxboard + rm -f $(DESTDIR)$(bindir)/zic2xpm + rm -f $(DESTDIR)$(man6dir)/xboard$(man6ext) $(DESTDIR)$(man6dir)/cmail$(man6ext) + rm -f $(DESTDIR)$(man6dir)/zic2xpm$(man6ext) + rm -f $(DESTDIR)$(infodir)/xboard.info (cd po && $(MAKE) $@) -PATH=$$PATH:/sbin:/usr/sbin install-info --delete \ - $(infodir)/xboard.info $(infodir)/dir + $(DESTDIR)$(infodir)/xboard.info $(DESTDIR)$(infodir)/dir clean: rm -f xboard zic2xpm *.o xboard.txt zic2xpm.txt $(LEX_OUTPUT_ROOT).c -- 1.7.0.4