Attachment 31178 Details for Bug 52070 – file.diff

[patch] file.diff

file.diff (text/plain), 3.81 KB, created by Serge Gagnon on 2003-05-11 11:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Serge Gagnon

Created: 2003-05-11 11:00:29 UTC

Size: 3.81 KB

patch

obsolete

>--- Imakefile.orig	Sat May 10 09:02:50 2003
>+++ Imakefile	Sat May 10 22:00:54 2003
>@@ -1,14 +1,15 @@
> XCOMM Should install to /usr or /usr/local ??
>-DESTDIR=/usr
>+DESTDIR=
>+PREFIX=/usr/X11R6
> 
> XCOMM Name of man subdirectory of DESTDIR:
>-MANDIR=/X11R6/man/man1
>+MANDIR=$(PREFIX)/man/man1
> 
> XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
>-BINDIR=/X11R6/bin
>+BINDIR=$(PREFIX)/bin
> 
> XCOMM Name of share subdirectory of DESTDIR:
>-SHAREDIR=/share/rmap
>+SHAREDIR=$(PREFIX)/share/rmap
> 
> XCOMM Default external utilities :
> XCOMM PostScript viewer, image viewer, HTML viewer, Print command
>@@ -33,18 +34,18 @@
> XCOMM HP-UX
> 
> ZLIBDIR=
>-CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
>+CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
> 
> #else
> 
> XCOMM SunOS
> ZLIBDIR=-L/usr/lib
>-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
>+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
> 
> XCOMM Solaris, Linux
> 
> ZLIBDIR=-L/usr/lib
>-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
>+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
> 
> #endif
> 
>@@ -62,28 +63,35 @@
> ComplexProgramTarget(xrmap)
> 
> install.man::
>-	if [ -r $(DESTDIR)$(MANDIR)/xrmap.1x.gz ] ; \
>-	   then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
>+	if [ -r $(MANDIR)/xrmap.1x.gz ] ; \
>+	   then gzip -f $(MANDIR)/xrmap.1x ; fi
> 
> all::
> 	strip xrmap ; ls -al xrmap
> 	cd editkit ; make emx
> 
> install:: install.man
>-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
>-	cp -f Xrmaprc Locations $(DESTDIR)$(SHAREDIR)
>+	$(MKDIRHIER) $(SHAREDIR)
>+	cp -f Xrmaprc Locations CIA_WDB2.jpd $(SHAREDIR)
>+	cp -f Xrmaprc Locations $(SHAREDIR)
> 	cd postscript ; rm -f *~
>-	cp -fR postscript  $(DESTDIR)$(SHAREDIR)
>+	cp -fR postscript  $(SHAREDIR)
> 	cd themes ; rm -f *~
>-	cp -fR themes  $(DESTDIR)$(SHAREDIR)
>+	cp -fR themes  $(SHAREDIR)
> 	if [ -d i18n ] ; then cd i18n ; rm -f *~ ; fi
>-	if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi
>-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags
>-	if [ -d picons ] ; then cp -fR picons $(DESTDIR)$(SHAREDIR) ; fi
>-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/doc
>+	if [ -d i18n ] ; then cp -fR i18n $(SHAREDIR) ; fi
>+	$(MKDIRHIER) $(SHAREDIR)/flags
>+	if [ -d flags ] ; then cp -fR flags $(SHAREDIR); fi
>+	if [ -d anthems ] ; then cp -fR anthems $(SHAREDIR); fi
>+	if [ -d hymns ] ; then cp -fR hymns $(SHAREDIR); fi
>+	if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
>+	if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi
>+	if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi
>+	if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
>+	$(MKDIRHIER) $(SHAREDIR)/doc
> 	cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP WARNING \
>-		midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
>-	cd examples ; cp -f * $(DESTDIR)$(SHAREDIR)/doc
>+		midi_cfg/README.midi $(SHAREDIR)/doc
>+	cd examples ; cp -f * $(SHAREDIR)/doc
> 	cd editkit ; make install
> 	cat WARNING
> 
>--- patch-Imakefile ends here ---

Actions: View | Diff

Attachments on bug 52070: 31177 | 31178