bug-groff
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[patch] groff 1.18.1: Use INSTALL_SCRIPT for scripts


From: Maciej W. Rozycki
Subject: [patch] groff 1.18.1: Use INSTALL_SCRIPT for scripts
Date: Thu, 24 Oct 2002 14:36:26 +0200 (MET DST)

Hello,

 There are a few scripts among device-specific files that get installed.
But INSTALL_DATA is used for them incorrectly, leading to improper
permissions being set (no execute permission).  Autoconf already provides
a suitable variable for script installation -- INSTALL_SCRIPT.  Following
is a patch that implements it.  Please apply.

2002-10-24  Maciej W. Rozycki  <address@hidden>

        * Makefile.comm (install_dev): Install scripts from DEVSCRIPTS
        with INSTALL_SCRIPT.
        (uninstall_dev): Uninstall scripts from DEVSCRIPTS.
        * Makefile.dev (all): Depend on DEVSCRIPTS.
        (install_dev): Likewise.
        * font/devdvi/Makefile.sub (DEVSCRIPTS): New variable to hold
        scripts.
        * font/devps/Makefile.sub (DEVSCRIPTS): Likewise.
        (DEVGENSCRIPTS): New variable to hold generated scripts.

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: address@hidden, PGP key available        +

groff-1.18-dev.patch
diff -up --recursive --new-file groff-1.18.macro/Makefile.comm 
groff-1.18/Makefile.comm
--- groff-1.18.macro/Makefile.comm      2002-06-03 16:01:41.000000000 +0000
+++ groff-1.18/Makefile.comm    2002-09-08 11:42:08.000000000 +0000
@@ -240,10 +240,18 @@ install_dev:
            $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
          fi; \
        done
+       -for f in $(DEVSCRIPTS); do \
+         rm -f $(fontsubdir)/$$f; \
+         if test -f $$f; then \
+           $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \
+         else \
+           $(INSTALL_SCRIPT) $(srcdir)/$$f $(fontsubdir)/$$f; \
+         fi; \
+       done
 
 .PHONY: uninstall_dev
 uninstall_dev:
-       -for f in $(DEVFILES); do rm -f $(fontsubdir)/$$f; done
+       -for f in $(DEVFILES) $(DEVSCRIPTS); do rm -f $(fontsubdir)/$$f; done
        -if test -d $(fontsubdir)/generate; then \
          rmdir $(fontsubdir)/generate; \
        fi
diff -up --recursive --new-file groff-1.18.macro/Makefile.dev 
groff-1.18/Makefile.dev
--- groff-1.18.macro/Makefile.dev       2000-02-06 09:34:29.000000000 +0000
+++ groff-1.18/Makefile.dev     2002-09-08 11:48:24.000000000 +0000
@@ -1,4 +1,4 @@
-all: $(DEVFILES)
+all: $(DEVFILES) $(DEVSCRIPTS)
 install_data: install_dev
 uninstall_sub: uninstall_dev
-install_dev: $(DEVFILES)
+install_dev: $(DEVFILES) $(DEVSCRIPTS)
diff -up --recursive --new-file groff-1.18.macro/font/devdvi/Makefile.sub 
groff-1.18/font/devdvi/Makefile.sub
--- groff-1.18.macro/font/devdvi/Makefile.sub   2002-02-27 02:23:12.000000000 
+0000
+++ groff-1.18/font/devdvi/Makefile.sub 2002-09-08 12:11:55.000000000 +0000
@@ -4,11 +4,12 @@ DEVFILES=DESC \
   TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \
   TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \
   MI S EX SA SB \
-  generate/CompileFonts generate/Makefile \
+  generate/Makefile \
   generate/msam.map generate/msbm.map \
   generate/texb.map generate/texex.map generate/texi.map generate/texmi.map \
   generate/texr.map generate/texsy.map generate/textt.map \
   generate/ec.map generate/tc.map
+DEVSCRIPTS=generate/CompileFonts
 
 CLEANADD=DESC
 
diff -up --recursive --new-file groff-1.18.macro/font/devps/Makefile.sub 
groff-1.18/font/devps/Makefile.sub
--- groff-1.18.macro/font/devps/Makefile.sub    2002-06-04 13:03:19.000000000 
+0000
+++ groff-1.18/font/devps/Makefile.sub  2002-09-08 11:47:31.000000000 +0000
@@ -4,10 +4,12 @@ DISTFILES=text.enc download \
   CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \
   NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
 PSFILES=prologue symbolsl.pfa zapfdr.pfa
-DEVGENFILES=generate/Makefile generate/afmname generate/dingbats.map \
-  generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
+DEVGENFILES=generate/Makefile generate/dingbats.map \
+  generate/dingbats.rmap generate/lgreekmap \
   generate/symbolchars generate/symbolsl.afm generate/textmap
+DEVGENSCRIPTS=generate/afmname generate/symbol.sed
 DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
+DEVSCRIPTS=$(DEVGENSCRIPTS)
 
 CLEANADD=DESC $(PSFILES)
 






reply via email to

[Prev in Thread] Current Thread [Next in Thread]