Skip to content
Browse files

Update mkinstalldirs to handle paths with spaces.

The newer mkinstalldirs can handle paths that have spaces in them.
While I'm at it, I also updated the Makefiles so that installation
can also work to DESTDIR directories that have spaces.
  • Loading branch information...
1 parent b959f47 commit 99a5d4ca9ece197327cd5a8a4916e7a9a36fd517 @steveicarus committed Feb 4, 2009
View
46 Makefile.in
@@ -261,55 +261,59 @@ install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@ $(libdir)/ivl$(suff
for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
- $(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi$(suffix)
+ $(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)"
$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
- $(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@
+ $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams
- $(INSTALL_DATA) $(srcdir)/constants.vams $(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams
+ $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams
- $(INSTALL_DATA) $(srcdir)/disciplines.vams $(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams
+ $(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams"
$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
- $(INSTALL_DATA) $(srcdir)/ivl_target.h $(DESTDIR)$(includedir)/ivl_target.h
+ $(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h"
$(includedir)/_pli_types.h: _pli_types.h
- $(INSTALL_DATA) $< $(DESTDIR)$(includedir)/_pli_types.h
+ $(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h"
$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
- $(INSTALL_DATA) $(srcdir)/vpi_user.h $(DESTDIR)$(includedir)/vpi_user.h
+ $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
$(includedir)/acc_user.h: $(srcdir)/acc_user.h
- $(INSTALL_DATA) $(srcdir)/acc_user.h $(DESTDIR)$(includedir)/acc_user.h
+ $(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h"
$(includedir)/veriuser.h: $(srcdir)/veriuser.h
- $(INSTALL_DATA) $(srcdir)/veriuser.h $(DESTDIR)$(includedir)/veriuser.h
+ $(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h"
$(mandir)/man1/iverilog-vpi$(suffix).1: $(srcdir)/iverilog-vpi.man
- $(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1
+ $(INSTALL_DATA) $(srcdir)/iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
- $(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
+ $(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
-installdirs: mkinstalldirs
- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl$(suffix) \
- $(DESTDIR)$(libdir)/ivl$(suffix)/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
+installdirs: $(srcdir)/mkinstalldirs
+ $(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(includedir)" \
+ "$(DESTDIR)$(libdir)/ivl$(suffix)" \
+ "$(DESTDIR)$(libdir)/ivl$(suffix)/include" \
+ "$(DESTDIR)$(mandir)" \
+ "$(DESTDIR)$(mandir)/man1"
uninstall:
for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
for f in ivl@EXEEXT@ include/constants.vams include/disciplines.vams; \
- do rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/$$f; done
- -rmdir $(DESTDIR)$(libdir)/ivl$(suffix)/include
- -rmdir $(DESTDIR)$(libdir)/ivl$(suffix)
+ do rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/$$f"; done
+ -rmdir "$(DESTDIR)$(libdir)/ivl$(suffix)/include"
+ -rmdir "$(DESTDIR)$(libdir)/ivl$(suffix)"
for f in verilog$(suffix) iverilog-vpi$(suffix) gverilog$(suffix)@EXEEXT@; \
- do rm -f $(DESTDIR)$(bindir)/$$f; done
+ do rm -f "$(DESTDIR)$(bindir)/$$f"; done
for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
- do rm -f $(DESTDIR)$(includedir)/$$f; done
- -test X$(suffix) = X || rmdir $(DESTDIR)/$(includedir)
- rm -f $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1 $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
+ do rm -f "$(DESTDIR)$(includedir)/$$f"; done
+ -test X$(suffix) = X || rmdir "$(DESTDIR)/$(includedir)"
+ rm -f "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
-include $(patsubst %.o, dep/%.d, $O)
View
10 cadpli/Makefile.in
@@ -76,16 +76,16 @@ clean:
distclean: clean
rm -f Makefile config.log
-install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32)
+install: all installdirs $(vpidir)/cadpli.vpl
$(vpidir)/cadpli.vpl: ./cadpli.vpl
- $(INSTALL_PROGRAM) ./cadpli.vpl $(DESTDIR)$(vpidir)/cadpli.vpl
+ $(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(vpidir)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(vpidir)"
uninstall: $(UNINSTALL32)
- rm -f $(DESTDIR)$(vpidir)/cadpli.vpl
+ rm -f "$(DESTDIR)$(vpidir)/cadpli.vpl"
uninstall32:
View
6 driver-vpi/Makefile.in
@@ -81,10 +81,10 @@ res.o: res.rc
install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
- $(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
+ $(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(bindir)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(bindir)"
uninstall:
rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
View
14 driver/Makefile.in
@@ -111,19 +111,19 @@ endif
install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)
$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
- $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ $(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@
+ $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
$(mandir)/man1/iverilog$(suffix).1: $(srcdir)/iverilog.man
- $(INSTALL_DATA) $(srcdir)/iverilog.man $(DESTDIR)$(mandir)/man1/iverilog$(suffix).1
+ $(INSTALL_DATA) $(srcdir)/iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
- $(INSTALL_DATA) iverilog.pdf $(prefix)/iverilog$(suffix).pdf
+ $(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(INSTALL_DOCDIR)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
uninstall:
- rm -f $(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@
- rm -f $(DESTDIR)$(mandir)/man1/iverilog$(suffix).1 $(DESTDIR)$(prefix)/iverilog$(suffix).pdf
+ rm -f "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
+ rm -f "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1" "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
-include $(patsubst %.o, dep/%.d, $O)
View
8 ivlpp/Makefile.in
@@ -65,13 +65,13 @@ lexor.c: lexor.lex
install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@: ivlpp@EXEEXT@
- $(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ $(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
+ $(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl$(suffix)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
uninstall:
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@"
lexor.o: lexor.c globals.h
main.o: main.c globals.h ../version.h
View
8 libveriuser/Makefile.in
@@ -90,12 +90,12 @@ distclean: clean
install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32)
$(libdir)/libveriuser$(suffix).a: ./libveriuser.a
- $(INSTALL_DATA) ./libveriuser.a $(DESTDIR)$(libdir)/libveriuser$(suffix).a
+ $(INSTALL_DATA) ./libveriuser.a "$(DESTDIR)$(libdir)/libveriuser$(suffix).a"
-installdirs: mkinstalldirs
- $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)"
uninstall::
- rm -f $(DESTDIR)$(libdir)/libveriuser$(suffix).a
+ rm -f "$(DESTDIR)$(libdir)/libveriuser$(suffix).a"
-include $(patsubst %.o, dep/%.d, $O)
View
40 libveriuser/mkinstalldirs
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.1 2002/05/19 05:21:00 steve Exp $
-
-errstatus=0
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
View
167 mkinstalldirs
@@ -1,40 +1,161 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-# $Id: mkinstalldirs,v 1.1 1999/04/25 21:54:33 steve Exp $
+scriptversion=2006-05-11.19
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
+dirmode=
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage"
+ exit $?
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+done
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+ 0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error. This is a problem when calling mkinstalldirs
+# from a parallel make. We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+ '')
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
+ fi
+ ;;
+esac
+
+for file
+do
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
+ shift
+ IFS=$oIFS
+
+ for d
+ do
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
+ mkdir "$pathcomp" || lasterr=$?
- mkdir "$pathcomp" || lasterr=$?
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
- pathcomp="$pathcomp/"
- done
+ pathcomp=$pathcomp/
+ done
done
exit $errstatus
-# mkinstalldirs ends here
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
View
22 tgt-fpga/Makefile.in
@@ -96,28 +96,28 @@ endif
install: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf
$(libdir)/ivl$(suffix)/fpga.tgt: ./fpga.tgt
- $(INSTALL_PROGRAM) ./fpga.tgt $(libdir)/ivl$(suffix)/fpga.tgt
+ $(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
$(libdir)/ivl$(suffix)/fpga.conf: $(srcdir)/fpga.conf
- $(INSTALL_DATA) $(srcdir)/fpga.conf $(libdir)/ivl$(suffix)/fpga.conf
+ $(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
$(libdir)/ivl$(suffix)/fpga-s.conf: $(srcdir)/fpga-s.conf
- $(INSTALL_DATA) $(srcdir)/fpga-s.conf $(libdir)/ivl$(suffix)/fpga-s.conf
+ $(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
$(mandir)/man1/iverilog-fpga$(suffix).1: $(srcdir)/iverilog-fpga.man
- $(INSTALL_DATA) $(srcdir)/iverilog-fpga.man $(mandir)/man1/iverilog-fpga$(suffix).1
+ $(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
$(prefix)/iverilog-fpga$(suffix).pdf: iverilog-fpga.pdf
- $(INSTALL_DATA) iverilog-fpga.pdf $(prefix)/iverilog-fpga$(suffix).pdf
+ $(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(libdir)/ivl$(suffix)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
uninstall:
- rm -f $(libdir)/ivl$(suffix)/fpga.tgt
- rm -f $(INSTALL_DOC)
- rm -f $(libdir)/ivl$(suffix)/fpga-s.conf
- rm -f $(libdir)/ivl$(suffix)/fpga.conf
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
+ rm -f "$(DESTDIR)$(INSTALL_DOC)"
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
-include $(patsubst %.o, dep/%.d, $O)
View
16 tgt-null/Makefile.in
@@ -75,22 +75,22 @@ Makefile: $(srcdir)/Makefile.in ../config.status
install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf
$(libdir)/ivl$(suffix)/null.tgt: ./null.tgt
- $(INSTALL_PROGRAM) ./null.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt
+ $(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
$(libdir)/ivl$(suffix)/null.conf: $(srcdir)/null.conf
- $(INSTALL_DATA) $(srcdir)/null.conf $(DESTDIR)$(libdir)/ivl$(suffix)/null.conf
+ $(INSTALL_DATA) $(srcdir)/null.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf"
$(libdir)/ivl$(suffix)/null-s.conf: $(srcdir)/null-s.conf
- $(INSTALL_DATA) $(srcdir)/null-s.conf $(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf
+ $(INSTALL_DATA) $(srcdir)/null-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/ivl$(suffix)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
uninstall:
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/null.conf
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf"
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf"
-include $(patsubst %.o, dep/%.d, $O)
View
8 tgt-pal/Makefile.in
@@ -72,14 +72,14 @@ Makefile: $(srcdir)/Makefile.in ../config.status
install: all installdirs $(libdir)/ivl/pal.tgt
$(libdir)/ivl/pal.tgt: ./pal.tgt
- $(INSTALL_PROGRAM) ./pal.tgt $(libdir)/ivl/pal.tgt
+ $(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(includedir) $(bindir) $(libdir)/ivl
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)/$(libdir)/ivl"
uninstall:
- rm -f $(libdir)/ivl/pal.tgt
+ rm -f "$DESTDIR)$(libdir)/ivl/pal.tgt"
-include $(patsubst %.o, dep/%.d, $O)
View
16 tgt-stub/Makefile.in
@@ -77,21 +77,21 @@ install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
$(libdir)/ivl$(suffix)/stub.tgt: ./stub.tgt
- $(INSTALL_PROGRAM) ./stub.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt
+ $(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
$(libdir)/ivl$(suffix)/stub.conf: stub.conf
- $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf
+ $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
$(libdir)/ivl$(suffix)/stub-s.conf: stub-s.conf
- $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf
+ $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/ivl$(suffix)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
uninstall:
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
-include $(patsubst %.o, dep/%.d, $O)
View
8 tgt-verilog/Makefile.in
@@ -74,14 +74,14 @@ install: all installdirs $(libdir)/ivl/verilog.tgt \
$(includedir)/vpi_user.h
$(libdir)/ivl/verilog.tgt: ./verilog.tgt
- $(INSTALL_PROGRAM) ./verilog.tgt $(libdir)/ivl/verilog.tgt
+ $(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(libdir)/ivl
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl"
uninstall:
- rm -f $(libdir)/ivl/verilog.tgt
+ rm -f "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
-include $(patsubst %.o, dep/%.d, $O)
View
12 tgt-vhdl/Makefile.in
@@ -81,19 +81,19 @@ install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/
$(libdir)/ivl$(suffix)/vhdl-s.conf
$(libdir)/ivl$(suffix)/vhdl.tgt: ./vhdl.tgt
- $(INSTALL_PROGRAM) ./vhdl.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt
+ $(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
$(libdir)/ivl$(suffix)/vhdl.conf: vhdl.conf
- $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf
+ $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
$(libdir)/ivl$(suffix)/vhdl-s.conf: vhdl-s.conf
- $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf
+ $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl$(suffix)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
uninstall:
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf $(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt" "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
-include $(patsubst %.o, dep/%.d, $O)
View
12 tgt-vvp/Makefile.in
@@ -91,20 +91,20 @@ check: all
install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
$(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
- $(INSTALL_PROGRAM) ./vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt
+ $(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
$(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
- $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf
+ $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
$(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
- $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
+ $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl$(suffix)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
uninstall:
- rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
+ rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt" "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf" "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
-include $(patsubst %.o, dep/%.d, $O)
View
28 vpi/Makefile.in
@@ -125,32 +125,32 @@ install: all installdirs \
$(vpidir)/v2005_math.vpi $(vpidir)/v2005_math.sft
$(vpidir)/system.vpi: ./system.vpi
- $(INSTALL_PROGRAM) ./system.vpi $(DESTDIR)$(vpidir)/system.vpi
+ $(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi"
$(vpidir)/system.sft: system.sft
- $(INSTALL_DATA) $< $(DESTDIR)$@
+ $(INSTALL_DATA) $< "$(DESTDIR)$@"
$(vpidir)/va_math.vpi: ./va_math.vpi
- $(INSTALL_PROGRAM) ./va_math.vpi $(DESTDIR)$(vpidir)/va_math.vpi
+ $(INSTALL_PROGRAM) ./va_math.vpi "$(DESTDIR)$(vpidir)/va_math.vpi"
$(vpidir)/va_math.sft: va_math.sft
- $(INSTALL_DATA) $< $(DESTDIR)$@
+ $(INSTALL_DATA) $< "$(DESTDIR)$@"
$(vpidir)/v2005_math.vpi: ./v2005_math.vpi
- $(INSTALL_PROGRAM) ./v2005_math.vpi $(DESTDIR)$(vpidir)/v2005_math.vpi
+ $(INSTALL_PROGRAM) ./v2005_math.vpi "$(DESTDIR)$(vpidir)/v2005_math.vpi"
$(vpidir)/v2005_math.sft: v2005_math.sft
- $(INSTALL_DATA) $< $(DESTDIR)$@
+ $(INSTALL_DATA) $< "$(DESTDIR)$@"
-installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(vpidir)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)" "$(DESTDIR)$(vpidir)"
uninstall:
- rm -f $(DESTDIR)$(vpidir)/system.vpi
- rm -f $(DESTDIR)$(vpidir)/system.sft
- rm -f $(DESTDIR)$(vpidir)/va_math.vpi
- rm -f $(DESTDIR)$(vpidir)/va_math.sft
- rm -f $(DESTDIR)$(vpidir)/v2005_math.vpi
- rm -f $(DESTDIR)$(vpidir)/v2005_math.sft
+ rm -f "$(DESTDIR)$(vpidir)/system.vpi"
+ rm -f "$(DESTDIR)$(vpidir)/system.sft"
+ rm -f "$(DESTDIR)$(vpidir)/va_math.vpi"
+ rm -f "$(DESTDIR)$(vpidir)/va_math.sft"
+ rm -f "$(DESTDIR)$(vpidir)/v2005_math.vpi"
+ rm -f "$(DESTDIR)$(vpidir)/v2005_math.sft"
-include $(patsubst %.o, dep/%.d, $O)
View
18 vvp/Makefile.in
@@ -159,24 +159,24 @@ config.h: $(srcdir)/config.h.in ../config.status
install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(libdir)/libvpi$(suffix).a $(INSTALL_DOC)
$(bindir)/vvp$(suffix)@EXEEXT@: ./vvp@EXEEXT@
- $(INSTALL_PROGRAM) ./vvp@EXEEXT@ $(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@
+ $(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
$(libdir)/libvpi$(suffix).a : ./libvpi.a
- $(INSTALL_DATA) libvpi.a $(DESTDIR)$(libdir)/libvpi$(suffix).a
+ $(INSTALL_DATA) libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
$(mandir)/man1/vvp$(suffix).1: $(srcdir)/vvp.man
- $(INSTALL_DATA) $(srcdir)/vvp.man $(DESTDIR)$(mandir)/man1/vvp$(suffix).1
+ $(INSTALL_DATA) $(srcdir)/vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1"
$(prefix)/vvp$(suffix).pdf: vvp.pdf
- $(INSTALL_DATA) vvp.pdf $(DESTDIR)$(prefix)/vvp$(suffix).pdf
+ $(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
-installdirs: $(srcdir)/mkinstalldirs
- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(INSTALL_DOCDIR)
+installdirs: $(srcdir)/../mkinstalldirs
+ $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
uninstall: $(UNINSTALL32)
- rm -f $(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@
- rm -f $(DESTDIR)$(libdir)/libvpi$(suffix).a
- rm -f $(DESTDIR)$(mandir)/man1/vvp$(suffix).1 $(DESTDIR)$(prefix)/vvp$(suffix).pdf
+ rm -f "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
+ rm -f "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
+ rm -f "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1" "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
-include $(patsubst %.o, dep/%.d, $O)
View
40 vvp/mkinstalldirs
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.1 2001/03/22 22:38:14 steve Exp $
-
-errstatus=0
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here

0 comments on commit 99a5d4c

Please sign in to comment.
Something went wrong with that request. Please try again.