diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -43,7 +43,8 @@ include conf/sources.mk # Load other configuration files include conf/dependencies.mk export MAVEN_LOCAL_REPO := $(shell $(CAT) conf/maven.local.repo.txt) -export JAR_DIR := $(shell $(CAT) conf/jardir.txt) +export JAR_DIR := $(shell $(CAT) conf/jardir.txt) +export bindir := $(shell $(CAT) conf/bindir.txt) # Post-processing for conf/sources.mk packages := $(filter-out _%,$(variables)) @@ -213,12 +214,12 @@ build/packages/%: $(MAKEFILE_LIST) $(ECHO) 'CLASSPATH=$(call deps2classpath,$^):$${CLASSPATH:+:$${CLASSPATH}}' && \ $(ECHO) 'export CLASSPATH' && \ $(ECHO) 'exec $(JAVA) $(call name2,extra,$*)' ; \ - } | $(INSTALL) -Dm755 /dev/stdin '$@/usr/bin/$(call name2,url,$*)' && \ + } | $(INSTALL) -Dm755 /dev/stdin '$@/$(bindir)/$(call name2,url,$*)' && \ { \ $(ECHO) '#!/bin/sh' && \ $(ECHO) 'CLASSPATH=$(call deps2classpath,$^):$${CLASSPATH:+:$${CLASSPATH}}' && \ $(ECHO) 'printf '%s\n' "$$CLASSPATH"' ; \ - } | $(INSTALL) -Dm755 /dev/stdin '$@/usr/bin/$(call name2,url,$*)-classpath' || \ + } | $(INSTALL) -Dm755 /dev/stdin '$@/$(bindir)/$(call name2,url,$*)-classpath' || \ { $(RM) -r '$@'; $(FAIL); } # boilerplate ################################################################## |