summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xbin/installmesa7
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 847b5b256d..a099475481 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ realclean:
install:
@echo "Installing"
- $(TOP)/bin/installmesa
+ $(TOP)/bin/installmesa $(DESTDIR)
# DirectFBGL module installation
linux-directfb-install:
diff --git a/bin/installmesa b/bin/installmesa
index 80fd8ef7e5..fad0722082 100755
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -12,7 +12,7 @@ TOP=.
INCLUDE_DIR="/usr/local/include"
LIB_DIR="/usr/local/lib"
-
+if [ x$# == "x0" ] ; then
echo
echo "***** Mesa installation - You may need root privileges to do this *****"
echo
@@ -33,7 +33,6 @@ if [ x${INPUT} != "x" ] ; then
LIB_DIR=${INPUT}
fi
-
echo
echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
@@ -41,6 +40,10 @@ echo "Press <Enter> to continue, or <ctrl>-C to abort."
read INPUT
+else
+INCLUDE_DIR=$1/include
+LIB_DIR=$1/lib
+fi
# flags:
# -f = force