Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:leto/plparrot
  • Loading branch information
David Fetter committed Jan 27, 2010
2 parents 7147e42 + 6fb26c8 commit 6c1667d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/handler/Makefile
Expand Up @@ -19,6 +19,7 @@ PARROTINCLUDEDIR = $(shell parrot_config includedir)
PARROTVERSION = $(shell parrot_config versiondir)
PARROTINC = "$(PARROTINCLUDEDIR)$(PARROTVERSION)"
PARROTLDFLAGS = $(shell parrot_config ldflags)
PARROTLINKFLAGS = $(shell parrot_config inst_libparrot_linkflags)

# We need to do various things with various versions of PostgreSQL.
VERSION = $(shell $(PG_CONFIG) --version | awk '{print $$2}')
Expand All @@ -30,4 +31,4 @@ PGVER_PATCH = $(shell echo $(VERSION) | awk -F. '{ print ($$3 + 0) }')
#PARROT_CCFLAGS=$(shell ~/svn/parrot/parrot_config ccflags)
#PARROT_CCFLAGS2=$(shell ~/svn/parrot/parrot_config ccflags_provisional)
override CPPFLAGS := -I$(PARROTINC) -I$(srcdir) $(CPPFLAGS)
override CFLAGS := $(PARROTLDFLAGS) -lparrot $(CFLAGS)
override CFLAGS := $(PARROTLDFLAGS) $(PARROTLINKFLAGS) $(CFLAGS)

0 comments on commit 6c1667d

Please sign in to comment.