aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-05-17 05:53:36 +0200
committerTristan Gingold <tgingold@free.fr>2017-05-18 07:59:34 +0200
commit513bbe9ca27c2c3beaf315df8280586a21cae76a (patch)
tree849f550b4877436e0f11ba1fc7e10ea64a05736a /dist
parent8d71ed4eb2e0e4fb4081ff8f5f220fdd44a741e2 (diff)
downloadghdl-513bbe9ca27c2c3beaf315df8280586a21cae76a.tar.gz
ghdl-513bbe9ca27c2c3beaf315df8280586a21cae76a.tar.bz2
ghdl-513bbe9ca27c2c3beaf315df8280586a21cae76a.zip
Fix typo: paths.
Diffstat (limited to 'dist')
-rw-r--r--dist/gcc/Make-lang.in48
-rw-r--r--dist/windows/mcode/Makefile.in22
-rw-r--r--dist/windows/mcode/default_paths.ads (renamed from dist/windows/mcode/default_pathes.ads)4
3 files changed, 37 insertions, 37 deletions
diff --git a/dist/gcc/Make-lang.in b/dist/gcc/Make-lang.in
index 690c834b7..ae163d953 100644
--- a/dist/gcc/Make-lang.in
+++ b/dist/gcc/Make-lang.in
@@ -86,32 +86,32 @@ else
VHDL_SOEXT=.so
endif
-vhdl/default_pathes.ads: Makefile
- echo "-- DO NOT EDIT" > tmp-dpathes.ads
- echo "-- This file is created by Makefile" >> tmp-dpathes.ads
- echo "package Default_Pathes is" >> tmp-dpathes.ads
- echo " -- Accept long lines." >> tmp-dpathes.ads
- echo " pragma Style_Checks (\"M999\");" >> tmp-dpathes.ads
- echo " Install_Prefix : constant String :=" >> tmp-dpathes.ads
- echo " \"$(exec_prefix)\";" >> tmp-dpathes.ads
+vhdl/default_paths.ads: Makefile
+ echo "-- DO NOT EDIT" > tmp-dpaths.ads
+ echo "-- This file is created by Makefile" >> tmp-dpaths.ads
+ echo "package Default_Paths is" >> tmp-dpaths.ads
+ echo " -- Accept long lines." >> tmp-dpaths.ads
+ echo " pragma Style_Checks (\"M999\");" >> tmp-dpaths.ads
+ echo " Install_Prefix : constant String :=" >> tmp-dpaths.ads
+ echo " \"$(exec_prefix)\";" >> tmp-dpaths.ads
suffix=`expr @"$(libexecdir)" : @"$(prefix)/\(.*\)"`; \
if test x"$$suffix" = x; then suffix="$(libexecdir)"; fi; \
- echo " Compiler_Gcc : constant String :=" >> tmp-dpathes.ads; \
- echo " \"$$suffix/gcc/$(target_noncanonical)/$(version)/ghdl1$(exeext)\";" >> tmp-dpathes.ads
- echo " Compiler_Debug : constant String := \"\";" >> tmp-dpathes.ads
- echo " Compiler_Mcode : constant String := \"\";" >> tmp-dpathes.ads
- echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpathes.ads
- echo " Post_Processor : constant String := \"\";" >> tmp-dpathes.ads
- echo " Lib_Prefix : constant String :=">> tmp-dpathes.ads
- echo " \"lib/ghdl\";" >> tmp-dpathes.ads
- echo " Shared_Library_Extension : constant String :=">> tmp-dpathes.ads
- echo " \"$(VHDL_SOEXT)\";" >> tmp-dpathes.ads
- echo " Default_Pie : constant Boolean := False;" >> tmp-dpathes.ads
- echo "end Default_Pathes;" >> tmp-dpathes.ads
- $(srcdir)/../move-if-change tmp-dpathes.ads $@
+ echo " Compiler_Gcc : constant String :=" >> tmp-dpaths.ads; \
+ echo " \"$$suffix/gcc/$(target_noncanonical)/$(version)/ghdl1$(exeext)\";" >> tmp-dpaths.ads
+ echo " Compiler_Debug : constant String := \"\";" >> tmp-dpaths.ads
+ echo " Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads
+ echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads
+ echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
+ echo " Lib_Prefix : constant String :=">> tmp-dpaths.ads
+ echo " \"lib/ghdl\";" >> tmp-dpaths.ads
+ echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
+ echo " \"$(VHDL_SOEXT)\";" >> tmp-dpaths.ads
+ echo " Default_Pie : constant Boolean := False;" >> tmp-dpaths.ads
+ echo "end Default_Paths;" >> tmp-dpaths.ads
+ $(srcdir)/../move-if-change tmp-dpaths.ads $@
# The driver for ghdl. Depends on ghdl1 to use object files in vhdl/ subdir.
-ghdl$(exeext): ghdl1$(exeext) vhdl/default_pathes.ads force
+ghdl$(exeext): ghdl1$(exeext) vhdl/default_paths.ads force
$(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aI$(srcdir)/vhdl/ghdldrv \
-aIvhdl -aOvhdl ghdl_gcc \
-bargs -E -cargs $(ADA_CFLAGS) $(GHDL_ADAFLAGS) -largs $(LIBS)
@@ -180,10 +180,10 @@ vhdl.uninstall:
vhdl.mostlyclean:
-$(RM) vhdl/*$(objext) vhdl/*.ali vhdl/b~*.ad?
- -$(RM) vhdl/default_pathes.ads
+ -$(RM) vhdl/default_paths.ads
vhdl.clean:
-$(RM) vhdl/*$(objext)
- -$(RM) vhdl/default_pathes.ads
+ -$(RM) vhdl/default_paths.ads
vhdl.distclean:
-$(RM) vhdl/Makefile
-$(RM) ghdl$(exeext)
diff --git a/dist/windows/mcode/Makefile.in b/dist/windows/mcode/Makefile.in
index beb450a08..be1f11516 100644
--- a/dist/windows/mcode/Makefile.in
+++ b/dist/windows/mcode/Makefile.in
@@ -13,25 +13,25 @@ GRTSRCDIR=grt
####grt Makefile.inc
-ghdl_mcode: default_pathes.ads $(GRT_ADD_OBJS) mmap_binding.o force
+ghdl_mcode: default_paths.ads $(GRT_ADD_OBJS) mmap_binding.o force
gnatmake -aIghdldrv -aIghdl -aIortho -aIgrt $(GNATFLAGS) ghdl_mcode $(GNAT_BARGS) -largs mmap_binding.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(GRT_EXTRA_LIB) -Wl,--version-script=$(GRTSRCDIR)/grt.ver -Wl,--export-dynamic
mmap_binding.o: ortho/mmap_binding.c
$(CC) -c -g -o $@ $<
-default_pathes.ads: Makefile
- echo "-- DO NOT EDIT" > tmp-dpathes.ads
- echo "-- This file is created by Makefile" >> tmp-dpathes.ads
- echo "package Default_Pathes is" >> tmp-dpathes.ads
- echo " Prefix : constant String :=">> tmp-dpathes.ads
- echo " \"$(PREFIX)/lib/ghdl/\";" >> tmp-dpathes.ads
- echo "end Default_Pathes;" >> tmp-dpathes.ads
- if test -r $@ && cmp tmp-dpathes.ads $@; then \
+default_paths.ads: Makefile
+ echo "-- DO NOT EDIT" > tmp-dpaths.ads
+ echo "-- This file is created by Makefile" >> tmp-dpaths.ads
+ echo "package Default_Paths is" >> tmp-dpaths.ads
+ echo " Prefix : constant String :=">> tmp-dpaths.ads
+ echo " \"$(PREFIX)/lib/ghdl/\";" >> tmp-dpaths.ads
+ echo "end Default_Paths;" >> tmp-dpaths.ads
+ if test -r $@ && cmp tmp-dpaths.ads $@; then \
echo "$@ unchanged"; \
else \
- mv tmp-dpathes.ads $@; \
+ mv tmp-dpaths.ads $@; \
fi
- $(RM) tmp-dpathes.ads
+ $(RM) tmp-dpaths.ads
force:
diff --git a/dist/windows/mcode/default_pathes.ads b/dist/windows/mcode/default_paths.ads
index d83addbe2..6b1d9d952 100644
--- a/dist/windows/mcode/default_pathes.ads
+++ b/dist/windows/mcode/default_paths.ads
@@ -1,9 +1,9 @@
with Windows_Default_Path;
pragma Elaborate_All (Windows_Default_Path);
-package Default_Pathes is
+package Default_Paths is
Install_Prefix : constant String :=
Windows_Default_Path.Get_Windows_Exec_Path;
Lib_Prefix : constant String := "lib";
Shared_Library_Extension : constant String := ".dll";
-end Default_Pathes;
+end Default_Paths;