[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Fix VPATH build of AdaCurses

From: Adam Van Ymeren
Subject: [PATCH] Fix VPATH build of AdaCurses
Date: Sun, 22 Mar 2020 23:54:47 -0400
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0

I believe that doing a VPATH based build of AdaCurses is broken. In Ada95/src/Makefile.in it refers to $(srcdir)/library.gpr, but library.gpr doesn't exist in srcdir during a VPATH build, it is generated into the build directory by Ada95/configure

The following patch fixes the build for me by removing the $(srcdir) prefix.


--- a/Ada95/src/Makefile.in
+++ b/Ada95/src/Makefile.in
@@ -273,9 +273,9 @@ STATIC_DIRS = \
 @USE_GNAT_PROJECTS@    @cf_ada_config@gprconfig --batch --config=Ada 
-@USE_GNAT_PROJECTS@    $(SHELL) $(srcdir)/library-cfg.sh static 
$(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+@USE_GNAT_PROJECTS@    $(SHELL) $(srcdir)/library-cfg.sh static library.gpr 
 @USE_GNAT_PROJECTS@    @echo "Using GNAT Project:"
-@USE_GNAT_PROJECTS@    @-$(SHELL) -c "diff -c $(srcdir)/library.gpr 
$(GNAT_PROJECT); exit 0"
+@USE_GNAT_PROJECTS@    @-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 
@@ -311,9 +311,9 @@ SHARED_DIRS = \
 @MAKE_ADA_SHAREDLIB@   @cf_ada_config@gprconfig --batch --config=Ada 
-@MAKE_ADA_SHAREDLIB@   $(SHELL) $(srcdir)/library-cfg.sh dynamic 
$(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
+@MAKE_ADA_SHAREDLIB@   $(SHELL) $(srcdir)/library-cfg.sh dynamic library.gpr 
 @MAKE_ADA_SHAREDLIB@   @echo "Making Ada shared-lib:"
-@MAKE_ADA_SHAREDLIB@   @-$(SHELL) -c "diff -c $(srcdir)/library.gpr 
$(GNAT_PROJECT); exit 0"
+@MAKE_ADA_SHAREDLIB@   @-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]