Permalink
Browse files

pointed extra at github

  • Loading branch information...
JohnSonnenschein committed Dec 3, 2010
1 parent c451887 commit 73352c8bc94645e2f762428f21f2ba3f0f105767
Showing with 12 additions and 12 deletions.
  1. +3 −3 Makefile
  2. +9 −9 configure
View
@@ -12,7 +12,7 @@ live: world
update:
@(git pull --rebase)
@(cd projects/illumos; git pull --rebase)
- @(cd projects/illumos-extras; git pull --rebase)
+ @(cd projects/illumos-extra; git pull --rebase)
0-local-stamp:
[ ! -d projects/local ] || (cd projects/local && gmake && gmake DESTDIR=$(PROTO) install)
@@ -23,7 +23,7 @@ update:
touch 0-illumos-stamp
0-extra-stamp:
- (cd $(ROOT)/projects/illumos-extras && gmake DESTDIR=$(PROTO) && gmake DESTDIR=$(PROTO) install)
+ (cd $(ROOT)/projects/illumos-extra && gmake DESTDIR=$(PROTO) && gmake DESTDIR=$(PROTO) install)
touch 0-extra-stamp
0-livesrc-stamp: src/bootparams.c
@@ -38,7 +38,7 @@ tools/builder/builder:
clean:
(cd $(ROOT)/src && gmake clean)
- (cd $(ROOT)/projects/illumos-extras && gmake clean)
+ (cd $(ROOT)/projects/illumos-extra && gmake clean)
[ ! -d projects/local ] || (cd projects/local && gmake clean)
(cd $(ROOT) && rm -rf $(PROTO))
(cd $(ROOT) && mkdir -p $(PROTO))
View
@@ -38,9 +38,9 @@ if [ "${HAVE_PKG}" == "true" ]; then
|| /bin/true
fi
-# TODO: move this to illumos-extras itself
+# TODO: move this to illumos-extra itself
if [ "${HAVE_PKG}" == "true" ]; then
- echo "==> Installing illumos-extras dependencies..."
+ echo "==> Installing illumos-extra dependencies..."
${ROOTCMD} pkg install \
compatibility/ucb \
developer/build/autoconf \
@@ -110,15 +110,15 @@ if [ ! -f "projects/illumos/usr/src/tools/env/illumos.sh" ]; then
fi
fi
-if [ ! -f "projects/illumos-extras/Makefile" ]; then
- echo " +--> Getting illumos-extras source tree..."
- if [ -z "${GET_ILLUMOS_EXTRAS}" ]; then
- echo "FATAL: No GET_ILLUMOS_EXTRAS defined in configure.*, can't get illumos-extras!"
+if [ ! -f "projects/illumos-extra/Makefile" ]; then
+ echo " +--> Getting illumos-extra source tree..."
+ if [ -z "${GET_ILLUMOS_EXTRA}" ]; then
+ echo "FATAL: No GET_ILLUMOS_EXTRA defined in configure.*, can't get illumos-extra!"
exit 1
fi
- /bin/bash -c "cd projects && ${GET_ILLUMOS_EXTRAS} && cd -"
- if [ ! -f "projects/illumos-extras/Makefile" ]; then
- echo "FATAL: GET_ILLUMOS_EXTRAS command failed to get illumos-extras!"
+ /bin/bash -c "cd projects && ${GET_ILLUMOS_EXTRA} && cd -"
+ if [ ! -f "projects/illumos-extra/Makefile" ]; then
+ echo "FATAL: GET_ILLUMOS_EXTRA command failed to get illumos-extra!"
exit 1
fi
fi

0 comments on commit 73352c8

Please sign in to comment.