Re: [Bug-ed] program prefix for ed

[Jeremy C. Reed]

On Tue, 8 Apr 2008, Antonio Diaz Diaz wrote:

> If they are simple changes, like renaming the executable, I'll be glad to
> accept them.


(Please CC me on replies.)

The following is simple. It does not rename the executable but adds a 
prefix. At first I just modified progname, but that ended up with more 
changes -- but that is a different way to do it.


--- configure.orig      2008-02-24 13:10:42.000000000 -0600
+++ configure   2008-04-08 12:54:40.000000000 -0500
@@ -11,6 +11,7 @@
 args=$*
 no_create=
 progname=ed
+program_prefix=
 progversion=0.9
 srctrigger=ed.h
 
@@ -58,6 +59,7 @@
                echo "  --infodir=DIR       info files directory [${infodir}]"
                echo "  --mandir=DIR        man pages directory [${mandir}]"
                echo "  --sysconfdir=DIR    read-only single-machine data 
directory [${sysconfdir}]"
+               echo "  --program-prefix=NAME     install program and 
documentation prefixed with NAME"
                echo "  CC=COMPILER         C compiler to use [gcc]"
                echo "  CXX=COMPILER        C++ compiler to use [g++]"
                echo "  CPPFLAGS=OPTIONS    command line options for the 
preprocessor [${CPPFLAGS}]"
@@ -71,7 +73,7 @@
                exit 0 ;;
        --srcdir* | --sr*)
                srcdir=`echo ${optarg} | sed -e 's,/$,,'` ;;
-       --prefix* | --pr*)
+       --prefix* | --pre*)
                prefix=`echo ${optarg} | sed -e 's,/$,,'` ;;
        --exec-prefix* | --ex*)
                exec_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;;
@@ -85,6 +87,8 @@
                mandir=`echo ${optarg} | sed -e 's,/$,,'` ;;
        --sysconfdir* | --sy*)
                sysconfdir=`echo ${optarg} | sed -e 's,/$,,'` ;;
+       --program-prefix* | --pro*)
+               program_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;;
        --no-create | --no-c*)
                no_create=yes ;;
 
@@ -188,6 +192,7 @@
 # to copy, distribute and modify it.
 
 progname = ${progname}
+program_prefix = ${program_prefix}
 progversion = ${progversion}
 VPATH = ${srcdir}
 prefix = ${prefix}
--- Makefile.in.orig    2007-08-05 13:45:46.000000000 -0500
+++ Makefile.in 2008-04-08 12:57:13.000000000 -0500
@@ -46,35 +46,35 @@
 
 install : all install-info
        if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d 
$(DESTDIR)$(bindir) ; fi
-       $(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname)
-       -rm -f $(DESTDIR)$(bindir)/r$(progname)
-       cd $(DESTDIR)$(bindir) ; ln $(progname) r$(progname)
+       $(INSTALL_PROGRAM) ./$(progname) 
$(DESTDIR)$(bindir)/$(program_prefix)$(progname)
+       -rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname)
+       cd $(DESTDIR)$(bindir) ; ln $(program_prefix)$(progname) 
$(program_prefix)r$(progname)
 
 install-info :
        if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d 
$(DESTDIR)$(infodir) ; fi
-       $(INSTALL_DATA) $(VPATH)/doc/$(progname).info 
$(DESTDIR)$(infodir)/$(progname).info
-       -install-info $(DESTDIR)$(infodir)/$(progname).info 
$(DESTDIR)$(infodir)/dir
+       $(INSTALL_DATA) $(VPATH)/doc/$(progname).info 
$(DESTDIR)$(infodir)/$(program_prefix)$(progname).info
+       -install-info $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info 
$(DESTDIR)$(infodir)/dir
 
 install-man :
        if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d 
$(DESTDIR)$(mandir)/man1 ; fi
-       $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 
$(DESTDIR)$(mandir)/man1/$(progname).1
-       -rm -f $(DESTDIR)$(mandir)/man1/r$(progname).1
-       cd $(DESTDIR)$(mandir)/man1 ; ln $(progname).1 r$(progname).1
+       $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 
$(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1
+       -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1
+       cd $(DESTDIR)$(mandir)/man1 ; ln $(program_prefix)$(progname).1 
$(program_prefix)r$(progname).1
 
 install-strip : all
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 uninstall : uninstall-info
-       -rm -f $(DESTDIR)$(bindir)/$(progname)
-       -rm -f $(DESTDIR)$(bindir)/r$(progname)
+       -rm -f $(DESTDIR)$(bindir)/$(program_prefix)$(progname)
+       -rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname)
 
 uninstall-info :
-       -install-info --remove $(DESTDIR)$(infodir)/$(progname).info 
$(DESTDIR)$(infodir)/dir
-       -rm -f $(DESTDIR)$(infodir)/$(progname).info
+       -install-info --remove 
$(DESTDIR)$(infodir)/$(program_prefix)$(progname).info $(DESTDIR)$(infodir)/dir
+       -rm -f $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info
 
 uninstall-man :
-       -rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
-       -rm -f $(DESTDIR)$(mandir)/man1/r$(progname).1
+       -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1
+       -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1
 
 dist :
        ln -sf . $(DISTNAME)

  Jeremy C. Reed