Changeset 69

Timestamp:

01/25/09 05:52:34 (3 years ago)

Author:

alonbl

Message:

Support different prefix

Location:

trunk

Files:

• README (modified) (1 diff)
• build (modified) (4 diffs)
• build.vars (modified) (1 diff)

trunk/README

@@ -64 +64 @@
         OPENSC_COMPONENTS
                 pcsc, openct
+        
+        OPENSC_TARGET_ROOT
+                Target OpenSC root, default /

trunk/build

@@ -146 +146 @@
         else
                 CHOST="${CHOST}" LDCONFIG=true CFLAGS="${CFLAGS} -fPIC -fpic -s" \
-                        ./configure --shared --prefix=/ || die "configure zlib"
+                        ./configure --shared --prefix="${OPENSC_TARGET_ROOT}" || die "configure zlib"
                 ${MAKE} install DESTDIR="${OPENSC_ROOT}" || die "make zlib"
         fi
@@ -173 +173 @@
         cd "${BUILDROOT}/openssl"* || die "cd openssl"
 
-        ./Configure --prefix="//" --cross-compile-prefix=${CHOST:+${CHOST}-} \
+        ./Configure --prefix="/${OPENSC_TARGET_ROOT}" --cross-compile-prefix=${CHOST:+${CHOST}-} \
                 shared $(CHOST="${CHOST}" "${SCRIPTROOT}/gentoo.config-0.9.8") \
                 zlib-dynamic ${ZLIB_CFLAGS} \
@@ -338 +338 @@
 
 CONFIGOPTS=" \
-        --prefix=/ \
-        --sbindir=/bin \
+        --prefix=${OPENSC_TARGET_ROOT} \
         --host=${CHOST} \
         --target=${CTARGET} \
@@ -373 +372 @@
 
 if [ -n "${BUILD_FOR_WINDOWS}" ]; then
+        CONFIGOPTS=" \
+                ${CONFIGOPTS} \
+                --sbindir=/bin \
+        "
         OPENSC_COMPONENTS="pcsc"
         export PKG_CONFIG="true"

trunk/build.vars

@@ -58 +58 @@
 #EXTRA_PKCS11_HELPER_CONFIG
 #EXTRA_OPENVPN_CONFIG
+
+OPENSC_TARGET_ROOT="${OPENSC_TARGET_ROOT:-/}"