Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[makl] wipe away reloc.mk hijacking in configure

  • Loading branch information...
commit 5eeb336a37180f80fed7faa2b5406dfd861f7c14 1 parent a8242c5
tho authored
Showing with 2 additions and 11 deletions.
  1. +0 −5 configure
  2. +2 −1  configure.help
  3. +0 −5 configure.sh
View
5 configure
@@ -46,8 +46,3 @@ makl_file_sub "bin/maklsh" \
"bin/lib/maklsh_funcs"
. "${MAKL_DIR}"/cf/makl.term
-
-# need to fix reloc.mk path because we don't have MAKL_DIR in place when
-# including Makefile.conf (would hit the {un,}install top level target)
-sed -e 's/reloc/$(MAKL_DIR)\/mk\/reloc/' $MAKL_DIR/Makefile.conf > .conf
-mv .conf "${MAKL_DIR}"/Makefile.conf
View
3  configure.help
@@ -18,6 +18,7 @@ OPTION can be defined as follows:
--defmode=MODE set default mode for regular files
--defbinmode=MODE set default mode for binary files
--gnu_make=GNUMAKEPATH set GNU make executable path on this system
+--bourne_shell=SHELL set a POSIX Bourne shell path
+--boot_file=BOOTFILE set explicit MaKL boot file
--script_suffix=SUFFIX append SUFFIX to installed script names
--script_prefix=PREFIX append PREFIX to installed script names
-
View
5 configure.sh
@@ -122,11 +122,6 @@ makl_file_sub "bin/maklsh" \
# write Makefile.conf
. "${MAKL_DIR}"/cf/makl.term
-# need to fix reloc.mk path because we don't have MAKL_DIR in place when
-# including Makefile.conf (would hit the {un,}install top level target)
-sed -e 's/reloc/mk\/reloc/' "${MAKL_DIR}"/Makefile.conf > .conf
-mv .conf "${MAKL_DIR}"/Makefile.conf
-
# output optional platform specific message
[ -n "${install_hint}" ] && echo ${install_hint}
exit 0
Please sign in to comment.
Something went wrong with that request. Please try again.