Skip to content
Browse files

Merge branch 'master' of git@github.com:bschmalhofer/pipp

  • Loading branch information...
2 parents 107120c + aec5eee commit 66a790cbfe58d279c8ffd7d0cc2fe3752574cdde @bschmalhofer committed
Showing with 6 additions and 4 deletions.
  1. +2 −1 build/templates/Makefile.in
  2. +3 −3 build/templates/src/pmc/Makefile.in
  3. +1 −0 dynext/.gitignore
View
3 build/templates/Makefile.in
@@ -10,6 +10,7 @@ EXE = @exe@
BUILD_DIR = @build_dir@
LIBRARY_DIR = $(BUILD_DIR)/runtime/parrot/library
PMC_DIR = src/pmc
+DYNEXT_DIR = dynext
# Set up commands
MAKE = @make_c@
@@ -20,7 +21,7 @@ NQP = $(BUILD_DIR)/compilers/nqp/nqp.pbc
PCT = $(BUILD_DIR)/runtime/parrot/library/PCT.pbc
PBC_TO_EXE = $(BUILD_DIR)/pbc_to_exe$(EXE)
-PIPP_GROUP = $(PMC_DIR)/pipp_group$(LOAD_EXT)
+PIPP_GROUP = $(DYNEXT_DIR)/pipp_group$(LOAD_EXT)
PMC_DEPS = \
$(PMC_DIR)/php.pmc \
View
6 build/templates/src/pmc/Makefile.in
@@ -10,13 +10,13 @@ CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@
# Set up directories
BUILD_DIR = @build_dir@
INCLUDE_DIR = $(BUILD_DIR)/include
-PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
+DYNEXT_DIR = ../../dynext
# Set up extensions
LOAD_EXT = @load_ext@
O = @o@
-PIPP_GROUP = pipp_group$(LOAD_EXT)
+PIPP_GROUP = $(DYNEXT_DIR)/pipp_group$(LOAD_EXT)
PMCS = \
php \
@@ -60,7 +60,7 @@ $(PIPP_GROUP): $(PMC_SOURCES)
$(PMCBUILD) generate $(PMCS)
$(PMCBUILD) compile $(PMCS)
$(PMCBUILD) linklibs $(PMCS)
- $(PMCBUILD) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
+ $(PMCBUILD) copy "--destination=$(DYNEXT_DIR)" $(PMCS)
# cleaning up
clean:
View
1 dynext/.gitignore
@@ -0,0 +1 @@
+pipp_group.so

0 comments on commit 66a790c

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