From de771dac5692fe5d9386dd094f70ee657db951f0 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Tue, 8 May 2012 15:41:09 +0000 Subject: [PATCH] Simplify install target for translation files and scripts. No longer creates bxglobal.old backup of bxglobal file at install time. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@167 13b04d17-f746-0410-82c6-800466cd88b0 --- Makefile.in | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1e3a17c..b095688 100644 --- a/Makefile.in +++ b/Makefile.in @@ -259,31 +259,18 @@ installscr-bx: installdirs scr-bx installscript: installdirs -@( \ if test -d $(top_srcdir)/script; then \ - cd $(top_srcdir)/script; \ - for i in *; do \ - if test "$$i" = "bxglobal" -a -f $(DESTDIR)$(INSTALL_SCRIPT)/bxglobal; then \ - if test -f bxglobal; then \ - $(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 $(DESTDIR)$(INSTALL_SCRIPT); \ - fi; \ - fi; \ - done; \ - chmod -x $(DESTDIR)$(INSTALL_SCRIPT)/*; \ + for i in $(top_srcdir)/script/*; do \ + $(INSTALL_DATA) "$$i" $(DESTDIR)$(INSTALL_SCRIPT); \ + done; \ + chmod -x $(DESTDIR)$(INSTALL_SCRIPT)/*; \ fi; \ ) installtranslation: installdirs -@( \ if test -d $(top_srcdir)/translation; then \ - cd $(top_srcdir)/translation; \ - for i in *; do \ - if test "$$i" != "CVS"; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TRANSLATION_PATH); \ - fi; \ + for i in $(top_srcdir)/translation/*; do \ + $(INSTALL_DATA) "$$i" $(DESTDIR)$(TRANSLATION_PATH); \ done; \ chmod -x $(DESTDIR)$(TRANSLATION_PATH)/*; \ fi; \