Skip to content
Browse files

change the order of commands to build on Fedora 14, add better output…

… of make when Parrot is installed
  • Loading branch information...
1 parent fb1e495 commit 483bef1e902a8e889ccdbdc3ae82975c0e82a0d7 gerd committed
Showing with 13 additions and 2 deletions.
  1. +13 −2 Makefile
View
15 Makefile
@@ -30,6 +30,10 @@ MINPARROTREVISION= 45961
# Which OS's does PL/Parrot want to support?
PARROT_IS_INSECURE = $(shell expr $(PARROTREVISION) \< $(MINPARROTREVISION))
+ifeq ($(PARROTREVISION),0)
+ PARROT_IS_INSECURE = 0
+ PARROT_VERSION = $(shell parrot_config VERSION)
+endif
# We may need to do various things with various versions of PostgreSQL.
# VERSION = $(shell $(PG_CONFIG) --version | awk '{print $$2}')
@@ -41,11 +45,12 @@ PARROT_IS_INSECURE = $(shell expr $(PARROTREVISION) \< $(MINPARROTREVISION))
override CPPFLAGS := -I$(PARROTINC) -I$(srcdir) $(CPPFLAGS)
override CFLAGS := $(PARROTLDFLAGS) $(PARROTLINKFLAGS) $(CFLAGS)
-# It would be nice if this ran before we compiled
-all: check_revision headers
ifneq ( $(strip $(wildcard $PERL6PBC)),)
override CFLAGS := $(CFLAGS) -DHAS_PERL6 -D'PERL6PBC="$(PERL6PBC)"'
endif
+
+# It would be nice if this ran before we compiled
+all: check_revision headers
@echo
@echo
@echo "Happy Hacking with PL/Parrot!"
@@ -62,7 +67,13 @@ ifeq ($(PARROT_IS_INSECURE),1)
@echo "This version of Parrot (r$(PARROTREVISION)) does not support the security features that PL/Parrot needs to prevent filesystem access"
@echo "***********************************************"
endif
+ifneq ($(PARROTREVISION),0)
@echo "Found a sufficiently new version of Parrot r$(PARROTREVISION)"
+else
+ @echo
+ @echo "Found the Parrot version $(PARROT_VERSION)"
+ @echo
+endif
test: all
psql -AX -f $(TESTS)

0 comments on commit 483bef1

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