Permalink
Browse files

OS-2390 illumos-extra g11n build breaks if MAKE is set

  • Loading branch information...
1 parent 2c07f9a commit cf85060431acc530902c0627ea6f5ddcc7e9ce81 @jclulow jclulow committed Jul 23, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 g11n/Makefile
View
@@ -27,10 +27,10 @@ SRC=$(shell (pwd))
LIBDIR=${DESTDIR}/usr/lib/iconv
all:
- @(cd src; pwd; SRC=$(SRC) $(SUN_MAKE) all)
+ @(cd src; pwd; unset MAKE; SRC=$(SRC) $(SUN_MAKE) all)
install: all
- @(cd src; pwd; SRC=$(SRC) $(SUN_MAKE) install)
+ @(cd src; pwd; unset MAKE; SRC=$(SRC) $(SUN_MAKE) install)
mkdir -p $(LIBDIR)
cp proto/i386/fileroot/usr/lib/iconv/UTF-8%646.so $(LIBDIR)
cp proto/i386/fileroot/usr/lib/iconv/UTF-8%UCS-2.so $(LIBDIR)
@@ -39,4 +39,4 @@ install: all
cp proto/i386/fileroot/usr/lib/iconv/UCS-2LE%UTF-8.so $(LIBDIR)
clean:
- @(cd src; pwd; SRC=$(SRC) $(MAKE) clean)
+ @(cd src; pwd; unset MAKE; SRC=$(SRC) $(SUN_MAKE) clean)

0 comments on commit cf85060

Please sign in to comment.