Changeset 3892

Timestamp:

May 11, 2005, 9:31:20 PM (21 years ago)

Author:

eugene

Message:

added option --prefix

Location:

trunk/Ohana

Files:

• Configure.in (modified) (1 diff)
• configure (modified) (3 diffs)

trunk/Ohana/Configure.in

@@ -10 +10 @@
 # if you use a different toplevel directory than $(ROOT), you might 
 # need to copy the include files in $(ROOT)/include by hand to the destination
-LBIN    = $(ROOT)/bin/$(ARCH)
-LINC    = $(ROOT)/include/$(ARCH)
-LLIB    = $(ROOT)/lib/$(ARCH)
-LMAN    = $(ROOT)/man/man1
+LBIN    = PREFIX/bin/$(ARCH)
+LINC    = PREFIX/include/$(ARCH)
+LLIB    = PREFIX/lib/$(ARCH)
+LMAN    = PREFIX/man/man1
 
 # X include and lib directories

trunk/Ohana/configure

@@ -17 +17 @@
 # evaluate command-line options
 set vararch = 0
-set root = ""
-set args = ""
+set prefix  = ""
+set root    = ""
+set args    = ""
 while ("$1" != "") 
  switch ($1)
   case --prefix
    shift
-   set root = $1
+   set prefix = $1
    breaksw;
   case --vararch
@@ -77 +78 @@
 
 # set up the basic directory names:
-if ($root == "") then
-    set root = `pwd`
-endif
-set inc = $root/include/$arch
-set lib = $root/lib/$arch
+set root = `pwd`
+if ($prefix == "") set prefix = $root
+set inc = $prefix/include/$arch
+set lib = $prefix/lib/$arch
 
 # check for basic libraries
@@ -151 +151 @@
 endif    
 
-echo ARCH: $arch
-echo ROOT: $root
 echo XINC: $xinc
 echo XLIB: $xlib
 
-if (-e Configure) then
-  mv Configure Configure.bak
-endif
+echo ARCH: $arch
+echo ROOT: $root
+echo PREFIX: $prefix
+
+if (-e Configure) mv Configure Configure.bak
 
 if ($vararch) then
-  cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|^\s*ARCH|# ARCH|"   | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
+  cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|PREFIX|$prefix|" | sed "s|^\s*ARCH|# ARCH|"   | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
   echo ""
-  echo "include $root/bin/"\$"ARCH in your path"
+  echo "include $prefix/bin/"\$"ARCH in your path"
 else 
-  cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|ARCHVAL|$arch|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
+  cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|PREFIX|$prefix|" | sed "s|ARCHVAL|$arch|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
   echo ""
-  echo "include $root/bin/$arch in your path"
+  echo "include $prefix/bin/$arch in your path"
 endif