[gs-cvs] gs/src

[Jack Moffitt]

Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv5277

Modified Files:
      Tag: GS_7_0X
	unix-dll.mak unixinst.mak 
Log Message:
Fix: Adds -p parameter to mkdir to suppress warning messages when the
target already exists and to create parent directories automatically if
they don't exist.  Fixes Sourceforge bug #518742.


Index: unix-dll.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/unix-dll.mak,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- unix-dll.mak	22 Feb 2002 19:46:00 -0000	1.6.2.1
+++ unix-dll.mak	19 Apr 2002 01:10:40 -0000	1.6.2.2
@@ -96,12 +96,12 @@
 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
 
 install-so: so
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(gsdir)
-	-mkdir $(gsdatadir)
-	-mkdir $(bindir)
-	-mkdir $(libdir)
+	-mkdir -p $(prefix)
+	-mkdir -p $(datadir)
+	-mkdir -p $(gsdir)
+	-mkdir -p $(gsdatadir)
+	-mkdir -p $(bindir)
+	-mkdir -p $(libdir)
 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
 	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
@@ -114,11 +114,11 @@
 
 # Make the build directories
 SODIRS: STDDIRS
-	@if test ! -d $(BINDIR)/$(SOBINRELDIR); then mkdir $(BINDIR)/$(SOBINRELDIR); fi
-	@if test ! -d $(GLGENDIR)/$(SOOBJRELDIR); then mkdir $(GLGENDIR)/$(SOOBJRELDIR); fi
-	@if test ! -d $(GLOBJDIR)/$(SOOBJRELDIR); then mkdir $(GLOBJDIR)/$(SOOBJRELDIR); fi
-	@if test ! -d $(PSGENDIR)/$(SOOBJRELDIR); then mkdir $(PSGENDIR)/$(SOOBJRELDIR); fi
-	@if test ! -d $(PSOBJDIR)/$(SOOBJRELDIR); then mkdir $(PSOBJDIR)/$(SOOBJRELDIR); fi
+	@if test ! -d $(BINDIR)/$(SOBINRELDIR); then mkdir -p $(BINDIR)/$(SOBINRELDIR); fi
+	@if test ! -d $(GLGENDIR)/$(SOOBJRELDIR); then mkdir -p $(GLGENDIR)/$(SOOBJRELDIR); fi
+	@if test ! -d $(GLOBJDIR)/$(SOOBJRELDIR); then mkdir -p $(GLOBJDIR)/$(SOOBJRELDIR); fi
+	@if test ! -d $(PSGENDIR)/$(SOOBJRELDIR); then mkdir -p $(PSGENDIR)/$(SOOBJRELDIR); fi
+	@if test ! -d $(PSOBJDIR)/$(SOOBJRELDIR); then mkdir -p $(PSOBJDIR)/$(SOOBJRELDIR); fi
 
 
 soclean: SODIRS

Index: unixinst.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/unixinst.mak,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -u -d -r1.20.2.8 -r1.20.2.9
--- unixinst.mak	18 Apr 2002 06:01:27 -0000	1.20.2.8
+++ unixinst.mak	19 Apr 2002 01:10:40 -0000	1.20.2.9
@@ -28,17 +28,17 @@
 # rules, just in case bindir or scriptdir is a subdirectory of any of these.
 
 install-exec: $(GS_XE)
-	-mkdir $(datadir)
-	-mkdir $(gsdir)
-	-mkdir $(gsdatadir)
-	-mkdir $(bindir)
+	-mkdir -p $(datadir)
+	-mkdir -p $(gsdir)
+	-mkdir -p $(gsdatadir)
+	-mkdir -p $(bindir)
 	$(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
 
 install-scripts: $(PSLIBDIR)/gsnd
-	-mkdir $(datadir)
-	-mkdir $(gsdir)
-	-mkdir $(gsdatadir)
-	-mkdir $(scriptdir)
+	-mkdir -p $(datadir)
+	-mkdir -p $(gsdir)
+	-mkdir -p $(gsdatadir)
+	-mkdir -p $(scriptdir)
 	$(SH) -c 'for f in \
 gsbj gsdj gsdj500 gslj gslp gsnd \
 bdftops dvipdf eps2eps font2c \
@@ -58,10 +58,10 @@
 # one file from each subdirectory just as a sanity check.
 
 install-libdata: 
-	-mkdir $(datadir)
-	-mkdir $(gsdir)
-	-mkdir $(gsdatadir)
-	-mkdir $(gsdatadir)/lib
+	-mkdir -p $(datadir)
+	-mkdir -p $(gsdir)
+	-mkdir -p $(gsdatadir)
+	-mkdir -p $(gsdatadir)/lib
 	$(SH) -c 'for f in \
 Fontmap Fontmap.GS \
 CIDFnmap CIDFnmap.Ore CIDFnmap.ARP CIDFnmap.Bae CIDFnmap.Koc \
@@ -104,7 +104,7 @@
 	   Psfiles.htm Public.htm Readme.htm Release.htm \
 	   Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
 install-doc: $(PSDOCDIR)/News.htm
-	-mkdir $(docdir)
+	-mkdir -p $(docdir)
 	$(SH) -c 'for f in $(DOC_PAGES) ;\
 	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(docdir); fi;\
 	done'
@@ -115,7 +115,7 @@
 MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
 MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
 install-man: $(PSMANDIR)/gs.1
-	$(SH) -c 'test -d $(mandir) || mkdir $(mandir)'
+	$(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
 	$(SH) -c 'for d in $(MAN_LCDIRS) ;\
 	do man1dir=$(mandir)/$$d/man$(man1ext) ;\
 	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
@@ -144,14 +144,14 @@
 
 # install the example files
 install-examples:
-	-mkdir $(exdir)
+	-mkdir -p $(exdir)
 	for f in \
 alphabet.ps colorcir.ps doretree.ps escher.ps golfer.ps \
 grayalph.ps snowflak.ps tiger.ps vasarely.ps waterfal.ps \
 ridt91.eps ;\
 	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(exdir) ;\
 	done
-	-mkdir $(exdir)/cjk
+	-mkdir -p $(exdir)/cjk
 	for f in \
 all_ac1.ps all_ag1.ps all_aj1.ps all_aj2.ps all_ak1.ps \
 gscjk_ac.ps gscjk_ag.ps gscjk_aj.ps gscjk_ak.ps \