Permalink
Browse files

Remove FORCE_PERL_PREFIX

Use the same --prefix for perl scripts as the rest of CIL.
  • Loading branch information...
1 parent 3941c7f commit 5e793394c529066d80cc24372aec112a788fb1dd @kerneis kerneis committed Aug 15, 2013
Showing with 10 additions and 18 deletions.
  1. +8 −8 Makefile.in
  2. +1 −1 README.md
  3. +1 −7 configure
  4. +0 −2 configure.ac
View
@@ -90,17 +90,12 @@ $(BINDIR)/$(CILLY)$(EXE): $(OBJDIR)/src/main$(EXEMODE)
# cilly perl wrapper
prefix = @prefix@
-
-FORCE_PERL_PREFIX ?= @FORCE_PERL_PREFIX@
-ifeq ($(FORCE_PERL_PREFIX), 1)
- PERL_MM_OPT = INSTALL_BASE="$(DESTDIR)$(prefix)"
- export PERL_MM_OPT
-endif
+INSTALL_BASE = $(prefix)
CILLYMOD := Cilly
$(CILLYDIR)/Makefile: Makefile $(CILLYDIR)/Makefile.PL $(CILLYDIR)/App/$(CILLYMOD).pm
- cd $(CILLYDIR); $(PERL) Makefile.PL
+ cd $(CILLYDIR); $(PERL) Makefile.PL INSTALL_BASE="$(INSTALL_BASE)"
.PHONY: $(CILLY)
$(CILLY): $(BINDIR)/$(CILLY)$(EXE) $(CILLYDIR)/Makefile
@@ -295,8 +290,13 @@ exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
bindir = @bindir@
+# Make DESTDIR absolute (necessary for perl installation)
+ifneq ($(DESTDIR),)
+ override DESTDIR := $(abspath $(DESTDIR))
+endif
+
install: $(CILLY) install-findlib
- $(MAKE) -C $(CILLYDIR) pure_install
+ $(MAKE) -C $(CILLYDIR) pure_install DESTDIR=$(DESTDIR) INSTALL_BASE=$(INSTALL_BASE)
$(INSTALL) -m 0755 $(BINDIR)/$(CILLY).* $(DESTDIR)$(bindir)
uninstall: $(CILLYDIR)/Makefile uninstall-findlib
View
@@ -42,7 +42,7 @@ If you want to install to some other directory, you can tweak the prefix
during the configure step. For instance, to install in your local [opam][]
directory:
- FORCE_PERL_PREFIX=1 ./configure --prefix=`opam config var prefix`
+ ./configure --prefix=`opam config var prefix`
[findlib]: http://projects.camlcity.org/projects/findlib.html
[opam]: http://opam.ocamlpro.com/
View
@@ -620,7 +620,6 @@ ac_includes_default="\
#endif"
ac_subst_vars='LTLIBOBJS
-FORCE_PERL_PREFIX
EXTRASRCDIRS
EXTRAFEATURES
UNDERSCORE_NAME
@@ -731,8 +730,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
-CPP
-FORCE_PERL_PREFIX'
+CPP'
# Initialize some variables set by options.
@@ -1357,8 +1355,6 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
- FORCE_PERL_PREFIX
- Install cilly wrapper in PREFIX/bin and PREFIX/lib
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -6147,8 +6143,6 @@ chmod -w Makefile.features
-
-
# finish the configure script and generate various files; ./configure
# will apply variable substitutions to <filename>.in to generate <filename>;
View
@@ -268,8 +268,6 @@ AC_SUBST(UNDERSCORE_NAME)
AC_SUBST(EXTRAFEATURES)
AC_SUBST(EXTRASRCDIRS)
-AC_ARG_VAR(FORCE_PERL_PREFIX, [Install cilly wrapper in PREFIX/bin and PREFIX/lib])
-
# finish the configure script and generate various files; ./configure
# will apply variable substitutions to <filename>.in to generate <filename>;

0 comments on commit 5e79339

Please sign in to comment.