[Gpg4win-commits] r400 - in trunk: . doc doc/manual src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun May 20 00:01:21 CEST 2007
Author: marcus
Date: 2007-05-20 00:01:21 +0200 (Sun, 20 May 2007)
New Revision: 400
Modified:
trunk/ChangeLog
trunk/autogen.sh
trunk/doc/ChangeLog
trunk/doc/manual/Makefile.am
trunk/src/Makefile.am
Log:
2007-05-19 Marcus Brinkmann <marcus at g10code.de>
* autogen.sh: Fix test.
* src/Makefile.am: Replace := by =.a
doc/
2007-05-19 Marcus Brinkmann <marcus at g10code.de>
* manual/Makefile.am: Replace := by =.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-19 21:45:02 UTC (rev 399)
+++ trunk/ChangeLog 2007-05-19 22:01:21 UTC (rev 400)
@@ -1,5 +1,8 @@
2007-05-19 Marcus Brinkmann <marcus at g10code.de>
+ * autogen.sh: Fix test.
+ * src/Makefile.am: Replace := by =.a
+
* packages/download.sh: Require bash due to brace expansion.
2007-05-17 Werner Koch <wk at g10code.com>
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2007-05-19 21:45:02 UTC (rev 399)
+++ trunk/autogen.sh 2007-05-19 22:01:21 UTC (rev 400)
@@ -37,7 +37,7 @@
DIE=no
FORCE=
-if test "$1" == "--force"; then
+if test "$1" = "--force"; then
FORCE=" --force"
shift
fi
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2007-05-19 21:45:02 UTC (rev 399)
+++ trunk/doc/ChangeLog 2007-05-19 22:01:21 UTC (rev 400)
@@ -1,3 +1,7 @@
+2007-05-19 Marcus Brinkmann <marcus at g10code.de>
+
+ * manual/Makefile.am: Replace := by =.
+
2007-05-16 Werner Koch <wk at g10code.com>
* manual/Makefile.am: Commented advanced manual.
Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am 2007-05-19 21:45:02 UTC (rev 399)
+++ trunk/doc/manual/Makefile.am 2007-05-19 22:01:21 UTC (rev 400)
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-png_files := \
+png_files = \
sc-inst-welcome.png sc-inst-license.png \
sc-inst-components.png sc-inst-directory.png \
sc-inst-options.png \
@@ -40,37 +40,37 @@
sc-en-gpa-rungpa.png sc-en-gpa-two-keys.png
-web_png_files := blank.png next.png previous.png up.png \
+web_png_files = blank.png next.png previous.png up.png \
home.png nonext.png noprevious.png noup.png
-eps_files := adele01.eps.gz adele02.eps.gz man-with-signed-key.eps.gz \
- egyptian-stone.eps.gz sealed-envelope.eps.gz \
- schlapphut-with-key.eps.gz tangled-schlapphut.eps.gz \
- verleihnix.eps.gz key-with-shadow-bit.eps.gz \
- letter-into-safe.eps.gz letter-out-of-safe.eps.gz \
- secret-key-exchange.eps.gz pk-safe-open.eps.gz \
- pk-safe-opened-with-sk.eps.gz think-passphrase.eps.gz \
- keyserver-world.eps.gz key-with-sigs.eps.gz \
- clock-face.eps.gz mileage-indicator.eps.gz \
- table-1.eps.gz table-2.eps.gz table-3.eps.gz \
- sc-gpa-first-key.eps.gz \
- sc-gpa-gen-email.eps.gz sc-gpa-gen-name.eps.gz \
- sc-gpa-gen-passwd.eps.gz sc-gpa-nokey.eps.gz \
- sc-gpa-rungpa.eps.gz sc-gpa-ks-export-p.eps.gz \
- sc-gpa-two-keys.eps.gz \
- sc-ol-send-test-key.eps.gz sc-ol-send-enc-msg1.eps.gz \
- sc-ol-send-enc-msg2.eps.gz \
- sc-gpgol-set-icon.eps.gz \
- sc-winpt-startmenu.eps.gz sc-winpt-trayicon.eps.gz \
- sc-winpt-clip-decrypt.eps.gz sc-winpt-good-sig.eps.gz \
- sc-winpt-sel-enc-key.eps.gz sc-winpt-enctoself.eps.gz \
- sc-misc-mein-key-asc.eps.gz
+eps_files = adele01.eps.gz adele02.eps.gz man-with-signed-key.eps.gz \
+ egyptian-stone.eps.gz sealed-envelope.eps.gz \
+ schlapphut-with-key.eps.gz tangled-schlapphut.eps.gz \
+ verleihnix.eps.gz key-with-shadow-bit.eps.gz \
+ letter-into-safe.eps.gz letter-out-of-safe.eps.gz \
+ secret-key-exchange.eps.gz pk-safe-open.eps.gz \
+ pk-safe-opened-with-sk.eps.gz think-passphrase.eps.gz \
+ keyserver-world.eps.gz key-with-sigs.eps.gz \
+ clock-face.eps.gz mileage-indicator.eps.gz \
+ table-1.eps.gz table-2.eps.gz table-3.eps.gz \
+ sc-gpa-first-key.eps.gz \
+ sc-gpa-gen-email.eps.gz sc-gpa-gen-name.eps.gz \
+ sc-gpa-gen-passwd.eps.gz sc-gpa-nokey.eps.gz \
+ sc-gpa-rungpa.eps.gz sc-gpa-ks-export-p.eps.gz \
+ sc-gpa-two-keys.eps.gz \
+ sc-ol-send-test-key.eps.gz sc-ol-send-enc-msg1.eps.gz \
+ sc-ol-send-enc-msg2.eps.gz \
+ sc-gpgol-set-icon.eps.gz \
+ sc-winpt-startmenu.eps.gz sc-winpt-trayicon.eps.gz \
+ sc-winpt-clip-decrypt.eps.gz sc-winpt-good-sig.eps.gz \
+ sc-winpt-sel-enc-key.eps.gz sc-winpt-enctoself.eps.gz \
+ sc-misc-mein-key-asc.eps.gz
-eps_files_bb := $(eps_files:.gz=.bb)
-eps_files_png := $(eps_files:.eps.gz=.png)
-#eps_files_pdf := $(eps_files:.eps.gz=.pdf)
-png_files_eps := $(png_files:.png=.eps)
+eps_files_bb = $(eps_files:.gz=.bb)
+eps_files_png = $(eps_files:.eps.gz=.png)
+#eps_files_pdf = $(eps_files:.eps.gz=.pdf)
+png_files_eps = $(png_files:.png=.eps)
EXTRA_DIST = fdl.tex einsteiger.tex durchblicker.tex novices.tex \
$(eps_files) $(png_files) $(web_png_files) \
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-05-19 21:45:02 UTC (rev 399)
+++ trunk/src/Makefile.am 2007-05-19 22:01:21 UTC (rev 400)
@@ -30,7 +30,7 @@
installer-options.ini NEWS.tmp gpgwrap.exe
# Supported source packages.
-gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws
+gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -91,7 +91,7 @@
--disable-spamassassin-plugin
# Supported make-only source packages.
-gpg4win_mpkgs := pthreads-w32
+gpg4win_mpkgs = pthreads-w32
# Extra options for the make infocations for individual packages.
# make_flags is used fur building make_args_inst is used for installing.
@@ -103,7 +103,7 @@
# Supported binary packages.
-gpg4win_bpkgs := libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
+gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
atk gtk+ gpgee crypt regex
# libiconv needs some special magic to generate a usable import
@@ -192,7 +192,7 @@
# Supported internal packages. Internal packages do not require any
# special support. Thus, this variable is actually unused, and no
# rules are added in gpg4win.mk.
-gpg4win_ipkgs := man_novice_de man_advanced_de man_novice_en man_advanced_en
+gpg4win_ipkgs = man_novice_de man_advanced_de man_novice_en man_advanced_en
# Now do the bunch of the work. This is a bunch of dirty magic to
@@ -209,7 +209,7 @@
clean-local: clean-gpg4win
-common_nsi := inst-sections.nsi installer.nsi installer-finish.nsi \
+common_nsi = inst-sections.nsi installer.nsi installer-finish.nsi \
$(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list))) \
$(addsuffix .nsi,$(addprefix uninst-,$(gpg4win_build_list)))
More information about the Gpg4win-commits
mailing list