X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMakefile.am;fp=micropeak%2FMakefile.am;h=bd938e2513ed5ede19b7dae7a1b8f56ed4745fe7;hp=017f5348d5ddb015ea9781b5c5b22c613d72bdaf;hb=140a84ba8ac1e6548ab63ff586cf214d87f727a4;hpb=7c4f9aa882256182485f7f2086221841368ddfc7

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 017f5348..bd938e25 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,5 +1,4 @@
 # location of code signing key, et al
-CODEKEYDIR=~/altusmetrumllc/ssl.com
  
 JAVAROOT=classes
 AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
@@ -348,9 +347,11 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
 	-rm -f $@
 	makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1)
-	jsign --keystore $(CODEKEYDIR)/altus_metrum,_llc.p12 --alias 1 \
-		--storetype PKCS12 --storepass `cat $(CODEKEYDIR)/password` \
-		--tsaurl http://ts.ssl.com --tsmode RFC3161 $@
+	if [ "$(HAVE_WINDOWS_KEY)" = "yes" ]; then \
+	jsign --keystore "$(WINDOWSKEYFILE)" --alias 1 \
+		--storetype PKCS12 --storepass `cat "$(WINDOWSKEYPASSFILE)"` \
+		--tsaurl http://ts.ssl.com --tsmode RFC3161 $@ ; \
+	fi
 
 Manifest.txt: Makefile
 	echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@