]> git.sur5r.net Git - openldap/commitdiff
Still wasn't working exactly write on FreeBSD3. Need to
authorKurt Zeilenga <kurt@openldap.org>
Mon, 21 Dec 1998 23:08:06 +0000 (23:08 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Mon, 21 Dec 1998 23:08:06 +0000 (23:08 +0000)
check for $OBJFORMAT and if not available set to output of
/usr/bin/objformat (if available).   Otherwise assume not elf.

build/ltconfig
build/ltmain.sh

index 729792ddb5ad02d292a8e8c4f45a34a9513f5cf3..e4ecdbd7ecaac41b5e049a96fd97e617795a2623 100755 (executable)
@@ -1134,7 +1134,8 @@ freebsd3*)
   version_type=freebsd
   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
   if [ -x `/usr/bin/objformat` ]; then
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT=`objformat` ldconfig -m $libdir'
+  OBJFORMAT=`/usr/bin/objformat`
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$OBJFORMAT" ldconfig -m $libdir'
   else
   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   fi
index ffacb3dfd6193514d1094d6383928065c65ec3c2..b66dcc0d9a559e5196b20019c17fcc3333348273 100755 (executable)
@@ -970,10 +970,17 @@ if test -z "$show_help"; then
       freebsd)
         version_vars="$version_vars major versuffix"
         major="$current"
-       if [ $PORTOBJFORMAT = elf ]; then
-        versuffix="$current";
+               
+       if [ X"$OBJFORMAT" = X ]; then
+               if [ -x /usr/bin/objformat ]; then
+                       OBJECTFORMAT=`objformat`
+               fi
+       fi
+               
+       if [ "$OBJFORMAT" = elf ]; then
+               versuffix="$current";
        else
-        versuffix="$current.$revision";
+               versuffix="$current.$revision";
        fi
         ;;