diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2012-09-17 23:17:18 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2012-09-17 23:17:18 +0200 |
| commit | 0a174260c5dd04d516da7a6021e681d49c312547 (patch) | |
| tree | 102e0cbb5eed9ce08126eeba4f6976fafdd3312b | |
| parent | c3a1946675855b299a2b36550cdf2c2f69d153aa (diff) | |
| download | distfold-0a174260c5dd04d516da7a6021e681d49c312547.tar.gz distfold-0a174260c5dd04d516da7a6021e681d49c312547.zip | |
minor build fixes
| -rw-r--r-- | distfoldd/distfoldd.pro | 8 | ||||
| -rwxr-xr-x | distfoldd/keygen.sh (renamed from utils/keygen.sh) | 4 | ||||
| -rwxr-xr-x | qtc_packaging/debian_harmattan/rules | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/distfoldd/distfoldd.pro b/distfoldd/distfoldd.pro index 3eb804e..3076068 100644 --- a/distfoldd/distfoldd.pro +++ b/distfoldd/distfoldd.pro @@ -30,6 +30,10 @@ HEADERS += \ compressor.h contains(MEEGO_EDITION,harmattan) { - target.path = /opt/distfold/bin - INSTALLS += target + target.path = /opt/distfold/bin + + scripts.files = keygen.sh + scripts.path = /opt/distfold/bin + + INSTALLS += target scripts } diff --git a/utils/keygen.sh b/distfoldd/keygen.sh index 8dd0119..d271b57 100755 --- a/utils/keygen.sh +++ b/distfoldd/keygen.sh @@ -1,5 +1,7 @@ #!/bin/sh +# Simple script to generate required SSL cert & private key. +# Place server.* files in ~/.config/distfold/ + openssl req -x509 -batch -newkey rsa:2048 -keyout server.key -nodes -days 365 -out server.crt chmod 0400 server.key server.crt - diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules index 77c3092..48adab5 100755 --- a/qtc_packaging/debian_harmattan/rules +++ b/qtc_packaging/debian_harmattan/rules @@ -9,10 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - - - - configure: configure-stamp configure-stamp: dh_testdir @@ -26,9 +22,7 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. # $(MAKE) # Uncomment this line for use without Qt Creator - #docbook-to-man debian/distfold.sgml > distfold.1 touch $@ @@ -37,8 +31,7 @@ clean: dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - $(MAKE) clean + -$(MAKE) clean dh_clean @@ -48,7 +41,6 @@ install: build dh_clean -k dh_installdirs - # Add here commands to install the package into debian/distfold. $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/distfold install |