Changeset 10317

Timestamp:

Nov 30, 2006, 9:08:53 AM (20 years ago)

Author:

eugene

Message:

added Makefile.Common, so support

Location:

trunk/Ohana

Files:

• Configure.in (modified) (1 diff)
• Makefile (modified) (1 diff)
• Makefile.Common (added)
• configure (modified) (2 diffs)
• ohana-config.in (added)

trunk/Ohana/Configure.in

@@ -12 +12 @@
 # LBIN  = PREFIX/bin/$(ARCH)
 
-BINDIR  = @BINDIR@
-INCDIR  = @INCDIR@
-LIBDIR  = @LIBDIR@
-MANDIR  = @MANDIR@
-HELPDIR = @HELPDIR@
+DESTBIN  = @BINDIR@
+DESTINC  = @INCDIR@
+DESTLIB  = @LIBDIR@
+DESTMAN  = @MANDIR@
+DESTHELP = @HELPDIR@
 
 # prefered C compiler

trunk/Ohana/Makefile

@@ -82 +82 @@
         mkdir -p $(LIBDIR)
         for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
+        chmod +x ohana-config
+        cp -f ohana-config $(BINDIR)/
 
 bins: 

trunk/Ohana/configure

@@ -241 +241 @@
 if ("$bindir" == "") then
   set subdir = bin
-  if ($vararch) set subdir = 'bin/$(ARCH)'
+  if ($vararch) then 
+    set subdir = 'bin/$(ARCH)'
+    set subpath = "bin/$arch"
+  endif
   set bindir = $prefix/$subdir
+  set binpath = $prefix/$subpath
 endif
 cat Configure.in.tmp | sed "s|@BINDIR@| $bindir|" > Configure.tmp
@@ -300 +304 @@
 cat Configure.in.tmp | sed "s|@ROOTDIR@|$root|" | sed "s|@INCDIRS@|$incdirs|" | sed "s|@LIBDIRS@|$libdirs|" | sed "s|@LIBFLAGS@|$libflags|" | sed "s|@OPTFLAGS@|$optflags $pedantic|" > Configure
 rm -f Configure.in.tmp Configure.tmp
+
+cat ohana-config.in | sed "s|@INCDIR@|$incdir|" | sed "s|@LIBDIR@|$libdir|" | sed "s|(ARCH)|ARCH|" > ohana-config
 
 echo ""