[mgp-users-jp 00530] Re: (mgp-users 00158) Re: 1.05a

["Takashi P.KATOH" <p-katoh@shiratori.riec.tohoku.ac.jp>]

かとぺ です。

mgp-users の方で出ていた、

From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Subject: (mgp-users 00158) Re: 1.05a
> I've got 2 remarks:
> - supporting the standard "--prefix" option to ./configure would be nice.

ですが、私も同じように思っていました。
で、パッチを作ってみました。

 --bindir
   mgp mgp2ps mgpembed.pl mgpnet xwintoppm

 --mandir
   mgp.man mgp2ps.man mgpembed.man mgpnet.man xwintoppm.man

 --datadir
   default.mgp mgp1.gif mgp2.gif mgp3.gif

がそれぞれ反映されるようになります。
今までとデフォルトが変わるのがちょっと問題かもしれませんが...

-- 
かとぺ / 加藤 貴司

diff -Nur magicpoint-1.05a,orig/Imakefile.in magicpoint-1.05a/Imakefile.in
--- magicpoint-1.05a,orig/Imakefile.in	Thu May 27 12:22:45 1999
+++ magicpoint-1.05a/Imakefile.in	Fri Jun 18 14:20:09 1999
@@ -1,6 +1,10 @@
 # $Id: Imakefile.in,v 1.48 1999/05/27 03:22:45 nishida Exp $
 
 @SET_MAKE@
+prefix=	@prefix@
+exec_prefix	= @exec_prefix@
+BINDIR=	@bindir@
+MANPATH=	@mandir@
 srcdir=	@srcdir@
 VPATH=	@srcdir@
 SRCS=	mgp.c draw.c parse.c plist.c print.c globals.c x11.c x11dummy.c \
@@ -122,8 +126,8 @@
 		$(srcdir)/missing/snprintf.c
 
 distclean:: clean
-	-/bin/rm -f config.status config.log config.cache ctlwords.h
-	-/bin/rm -f scanner.c grammar.c tokdefs.h mgp.0 mgp2ps.0
+	-/bin/rm -f .depend config.status config.log config.cache ctlwords.h
+	-/bin/rm -f mgpembed.pl scanner.c grammar.c tokdefs.h mgp.0 mgp2ps.0
 	-/bin/rm -f contrib/mgp2html.pl contrib/mgp2latex.pl
 	for i in $(SUBDIRS); do \
 		(cd $$i; if [ -f Makefile ]; then make distclean; fi); \
diff -Nur magicpoint-1.05a,orig/configure magicpoint-1.05a/configure
--- magicpoint-1.05a,orig/configure	Wed Jun  9 05:00:39 1999
+++ magicpoint-1.05a/configure	Fri Jun 18 14:23:18 1999
@@ -2425,6 +2425,7 @@
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "Imakefile image/Imakefile sample/Imakefile
+	contrib/Imakefile contrib/xwintoppm/Imakefile
 	contrib/mgp2html.pl contrib/mgp2latex.pl contrib/mgpnet mgpembed.pl" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2520,6 +2521,7 @@
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Imakefile image/Imakefile sample/Imakefile
+	contrib/Imakefile contrib/xwintoppm/Imakefile
 	contrib/mgp2html.pl contrib/mgp2latex.pl contrib/mgpnet mgpembed.pl"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff -Nur magicpoint-1.05a,orig/configure.in magicpoint-1.05a/configure.in
--- magicpoint-1.05a,orig/configure.in	Wed Jun  9 05:00:41 1999
+++ magicpoint-1.05a/configure.in	Fri Jun 18 14:14:36 1999
@@ -246,6 +246,7 @@
 AC_SUBST(mgp_keywords)
  
 AC_OUTPUT(Imakefile image/Imakefile sample/Imakefile
+	contrib/Imakefile contrib/xwintoppm/Imakefile
 	contrib/mgp2html.pl contrib/mgp2latex.pl contrib/mgpnet mgpembed.pl)
 
 /bin/rm -f Makefile image/Makefile
diff -Nur magicpoint-1.05a,orig/contrib/Imakefile magicpoint-1.05a/contrib/Imakefile
--- magicpoint-1.05a,orig/contrib/Imakefile	Fri Feb 13 16:48:21 1998
+++ magicpoint-1.05a/contrib/Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,23 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS=	xwintoppm
-
-MakeSubdirs($(SUBDIRS))
-
-#if defined(ImakeConfigRelease) && ImakeConfigRelease >= 6
-InstallNamedTarget(install,mgpnet,$(INSTBINFLAGS),$(BINDIR),mgpnet) /*R6 only*/
-#else
-InstallNamedProg(mgpnet,mgpnet,$(BINDIR)) /*obsoleted in R6?*/
-#endif
-InstallManPage(mgpnet,$(MANDIR))
-
-all::
-depend::
-install::
-
-distclean:: clean
-	for i in $(SUBDIRS); do \
-		(cd $$i; if [ -f Makefile ]; then make distclean; fi) ;\
-	done
-	-/bin/rm -f mgpnet mgpnet.0 mgp2latex.pl mgp2html.pl Makefile
diff -Nur magicpoint-1.05a,orig/contrib/Imakefile.in magicpoint-1.05a/contrib/Imakefile.in
--- magicpoint-1.05a,orig/contrib/Imakefile.in	Thu Jan  1 09:00:00 1970
+++ magicpoint-1.05a/contrib/Imakefile.in	Fri Jun 18 14:43:29 1999
@@ -0,0 +1,28 @@
+prefix= @prefix@
+exec_prefix     = @exec_prefix@
+BINDIR= @bindir@
+MANPATH=        @mandir@
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+SUBDIRS=	xwintoppm
+
+MakeSubdirs($(SUBDIRS))
+
+#if defined(ImakeConfigRelease) && ImakeConfigRelease >= 6
+InstallNamedTarget(install,mgpnet,$(INSTBINFLAGS),$(BINDIR),mgpnet) /*R6 only*/
+#else
+InstallNamedProg(mgpnet,mgpnet,$(BINDIR)) /*obsoleted in R6?*/
+#endif
+InstallManPage(mgpnet,$(MANDIR))
+
+all::
+depend::
+install::
+
+distclean:: clean
+	for i in $(SUBDIRS); do \
+		(cd $$i; if [ -f Makefile ]; then make distclean; fi) ;\
+	done
+	-/bin/rm -f mgpnet mgpnet.0 mgp2latex.pl mgp2html.pl Makefile Imakefile
diff -Nur magicpoint-1.05a,orig/contrib/xwintoppm/Imakefile magicpoint-1.05a/contrib/xwintoppm/Imakefile
--- magicpoint-1.05a,orig/contrib/xwintoppm/Imakefile	Fri Feb 13 16:48:28 1998
+++ magicpoint-1.05a/contrib/xwintoppm/Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,17 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/01/14 16:53:10 kaleb $
-#if defined(ImakeConfigRelease) && ImakeConfigRelease >= 6
-/* obeys original xwd */
-        DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
-#else
-/* Xt is needed, it seems */
-        DEPLIBS = $(DEPXMULIB) $(XTOOLLIBDEP) $(DEPXLIB)
-LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB)
-#endif
-           SRCS = xwintoppm.c dsimple.c list.c multiVis.c
-           OBJS = xwintoppm.o dsimple.o list.o multiVis.o
-
-ComplexProgramTarget(xwintoppm)
-
-distclean:: clean
-	-/bin/rm -f Makefile xwintoppm.0
diff -Nur magicpoint-1.05a,orig/contrib/xwintoppm/Imakefile.in magicpoint-1.05a/contrib/xwintoppm/Imakefile.in
--- magicpoint-1.05a,orig/contrib/xwintoppm/Imakefile.in	Thu Jan  1 09:00:00 1970
+++ magicpoint-1.05a/contrib/xwintoppm/Imakefile.in	Fri Jun 18 14:43:44 1999
@@ -0,0 +1,22 @@
+prefix= @prefix@
+exec_prefix     = @exec_prefix@
+BINDIR= @bindir@
+MANPATH=        @mandir@
+
+XCOMM $XConsortium: Imakefile /main/9 1996/01/14 16:53:10 kaleb $
+#if defined(ImakeConfigRelease) && ImakeConfigRelease >= 6
+/* obeys original xwd */
+        DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
+LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
+#else
+/* Xt is needed, it seems */
+        DEPLIBS = $(DEPXMULIB) $(XTOOLLIBDEP) $(DEPXLIB)
+LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB)
+#endif
+           SRCS = xwintoppm.c dsimple.c list.c multiVis.c
+           OBJS = xwintoppm.o dsimple.o list.o multiVis.o
+
+ComplexProgramTarget(xwintoppm)
+
+distclean:: clean
+	-/bin/rm -f Makefile xwintoppm.0 Imakefile
diff -Nur magicpoint-1.05a,orig/image/Imakefile.in magicpoint-1.05a/image/Imakefile.in
--- magicpoint-1.05a,orig/image/Imakefile.in	Thu May 27 12:22:58 1999
+++ magicpoint-1.05a/image/Imakefile.in	Fri Jun 18 14:19:47 1999
@@ -25,6 +25,6 @@
 NormalLibraryTarget($(TARGET0), $(OBJS))
 
 distclean::	clean
-	-/bin/rm -f Imakefile Makefile
+	-/bin/rm -f Imakefile Makefile .depend
 
 /*EOF*/
diff -Nur magicpoint-1.05a,orig/sample/Imakefile.in magicpoint-1.05a/sample/Imakefile.in
--- magicpoint-1.05a,orig/sample/Imakefile.in	Fri Feb 13 16:49:22 1998
+++ magicpoint-1.05a/sample/Imakefile.in	Fri Jun 18 14:09:23 1999
@@ -1,3 +1,6 @@
+prefix= @prefix@
+LIBDIR=	@datadir@
+
 InstallNonExecFile(default.mgp,$(LIBDIR)/mgp)
 InstallNonExecFile(mgp1.gif,$(LIBDIR)/mgp)
 InstallNonExecFile(mgp2.gif,$(LIBDIR)/mgp)