summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Doffman <mark.doffman@codethink.co.uk>2013-09-26 11:23:46 +0000
committerMark Doffman <mark.doffman@codethink.co.uk>2013-09-26 11:23:46 +0000
commitb2261525ce098231b0f9d1b07c1770d57c50c410 (patch)
tree99ee6de059d8c9cbae25eef81216d28f92a058db
parentd5e4d2b762e63de352a508d9b0e3ab4cdf26ce0a (diff)
downloadnss-hg-b2261525ce098231b0f9d1b07c1770d57c50c410.tar.gz
Add a make and install script for nss.
-rw-r--r--config/Makefile4
-rwxr-xr-xinstall.sh18
-rwxr-xr-xmake.sh6
3 files changed, 26 insertions, 2 deletions
diff --git a/config/Makefile b/config/Makefile
index d59ca6f23..676ed11e6 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -22,7 +22,7 @@ export:
-e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
nss.pc.in > nss.pc
chmod 0644 nss.pc
- ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
+ ln -sf `dirname $(CURDIR)`/config/nss.pc $(DIST)/lib/pkgconfig
# Create the nss-config script
mkdir -p $(DIST)/bin
@@ -32,7 +32,7 @@ export:
-e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
nss-config.in > nss-config
chmod 0755 nss-config
- ln -sf ../../../nss/config/nss-config $(DIST)/bin
+ ln -sf `dirname $(CURDIR)`/config/nss-config $(DIST)/bin
libs:
diff --git a/install.sh b/install.sh
new file mode 100755
index 000000000..998fe4324
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,18 @@
+install_directory() {
+for f in $2;
+do
+install $1 -D $f "$3/`basename $f`"
+done
+}
+
+install_directory -m755 "../dist/Linux*/lib/*.so" $DESTDIR$PREFIX/lib &&
+install -D -m644 ../dist/Linux*/lib/libcrmf.a $DESTDIR$PREFIX/lib &&
+install_directory -m644 "../dist/Linux*/lib/*.chk" $DESTDIR$PREFIX/lib &&
+mkdir -m755 -p $DESTDIR$PREFIX/include/nss &&
+cp -v -RL ../dist/private/nss/* $DESTDIR$PREFIX/include/nss &&
+cp -v -RL ../dist/public/nss/* $DESTDIR$PREFIX/include/nss &&
+chmod 644 $DESTDIR$PREFIX/include/nss/* &&
+install -D -m755 ../dist/Linux*/bin/certutil $DESTDIR$PREFIX/bin/certutil &&
+install -D -m755 ../dist/Linux*/bin/nss-config $DESTDIR$PREFIX/bin/nss-config &&
+install -D -m755 ../dist/Linux*/bin/pk12util $DESTDIR$PREFIX/bin/pk12util &&
+install -D -m644 ../dist/Linux*/lib/pkgconfig/nss.pc $DESTDIR$PREFIX/lib/pkgconfig/nss.pc
diff --git a/make.sh b/make.sh
new file mode 100755
index 000000000..8a0b479db
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,6 @@
+make BUILD_OPT=1 \
+ NSPR_INCLUDE_DIR=/usr/include/nspr \
+ USE_SYSTEM_ZLIB=1 \
+ ZLIB_LIBS=-lz \
+ $([ $(uname -m) = x86_64 ] && echo USE_64=1) \
+ $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)