Permalink
Browse files

Merge branch 'master' of github.com:visionmedia/mad

  • Loading branch information...
2 parents fea3319 + 34e1a58 commit aa8d00f7ab1c8805d020c0e74d946a3fca1ebae0 @tj committed Apr 19, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 Makefile
  2. +2 −2 bin/mad
View
@@ -1,8 +1,8 @@
-PREFIX=/usr/local
+PREFIX?=/usr/local
install:
- mkdir -p $(PREFIX)/share/mad
+ mkdir -p $(PREFIX)/share/mad $(PREFIX)/etc $(PREFIX)/bin
cp -f bin/mad $(PREFIX)/bin/mad
cp -f share/mad/mad.md $(PREFIX)/share/mad/mad.md
cp -f etc/mad.conf $(PREFIX)/etc/mad.conf
View
@@ -30,7 +30,7 @@ list_pages() {
display() {
IFS=":"
local page=$1
- local paths=".:$MAD_PATH:/usr/local/share/mad:/usr/share/mad"
+ local paths=".:$MAD_PATH:$(dirname $0)/../share/mad:/usr/share/mad"
for path in $paths; do
local file=$path/$page
@@ -93,7 +93,7 @@ display_mad_usage() {
#
install_all_remote() {
- local path=/usr/local/share/mad
+ local path=$(dirname $0)/../share/mad
echo
echo " ... cloning repo"
cd /tmp && rm -fr mad-pages

0 comments on commit aa8d00f

Please sign in to comment.