$NetBSD: patch-aa,v 1.2 2004/03/23 22:54:54 minskim Exp $

--- gpgme/Makefile.in.orig	2003-11-19 02:55:10.000000000 -0600
+++ gpgme/Makefile.in
@@ -175,9 +175,9 @@ bin_SCRIPTS = gpgme-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gpgme.m4
 include_HEADERS = gpgme.h
-lib_LTLIBRARIES = libgpgme.la
+lib_LTLIBRARIES = libgpgme03.la
 
-libgpgme_la_LDFLAGS = -version-info \
+libgpgme03_la_LDFLAGS = -version-info \
       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 
 @BUILD_ASSUAN_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/assuan
@@ -193,7 +193,7 @@ ath_components = ath.h ath.c ${ath_compo
 @HAVE_DOSISH_SYSTEM_TRUE@system_components = w32-util.c w32-sema.c w32-io.c
 @HAVE_DOSISH_SYSTEM_FALSE@system_components = ${ath_components} posix-util.c posix-sema.c posix-io.c
 
-libgpgme_la_SOURCES = \
+libgpgme03_la_SOURCES = \
 	gpgme.h types.h util.h util.c conversion.c context.h ops.h	\
 	data.c recipient.c signers.c wait.c wait.h op-support.c		\
 	encrypt.c encrypt-sign.c decrypt.c decrypt-verify.c verify.c	\
@@ -205,7 +205,7 @@ libgpgme_la_SOURCES = \
 	sema.h io.h ${system_components}				\
 	debug.c debug.h gpgme.c version.c errors.c
 
-libgpgme_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@
+libgpgme03_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@
 subdir = gpgme
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -213,10 +213,10 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gpgme-config
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-@BUILD_ASSUAN_TRUE@libgpgme_la_DEPENDENCIES = ../assuan/libassuan.la \
+@BUILD_ASSUAN_TRUE@libgpgme03_la_DEPENDENCIES = ../assuan/libassuan.la \
 @BUILD_ASSUAN_TRUE@	@LTLIBOBJS@
-@BUILD_ASSUAN_FALSE@libgpgme_la_DEPENDENCIES = @LTLIBOBJS@
-am__libgpgme_la_SOURCES_DIST = gpgme.h types.h util.h util.c \
+@BUILD_ASSUAN_FALSE@libgpgme03_la_DEPENDENCIES = @LTLIBOBJS@
+am__libgpgme03_la_SOURCES_DIST = gpgme.h types.h util.h util.c \
 	conversion.c context.h ops.h data.c recipient.c signers.c \
 	wait.c wait.h op-support.c encrypt.c encrypt-sign.c decrypt.c \
 	decrypt-verify.c verify.c sign.c passphrase.c progress.c key.h \
@@ -235,13 +235,13 @@ am__objects_3 = ath.lo $(am__objects_1) 
 @HAVE_DOSISH_SYSTEM_TRUE@	w32-io.lo
 @HAVE_DOSISH_SYSTEM_FALSE@am__objects_4 = $(am__objects_3) posix-util.lo \
 @HAVE_DOSISH_SYSTEM_FALSE@	posix-sema.lo posix-io.lo
-am_libgpgme_la_OBJECTS = util.lo conversion.lo data.lo recipient.lo \
+am_libgpgme03_la_OBJECTS = util.lo conversion.lo data.lo recipient.lo \
 	signers.lo wait.lo op-support.lo encrypt.lo encrypt-sign.lo \
 	decrypt.lo decrypt-verify.lo verify.lo sign.lo passphrase.lo \
 	progress.lo key.lo keylist.lo trustlist.lo import.lo export.lo \
 	genkey.lo delete.lo edit.lo engine.lo rungpg.lo engine-gpgsm.lo \
 	$(am__objects_4) debug.lo gpgme.lo version.lo errors.lo
-libgpgme_la_OBJECTS = $(am_libgpgme_la_OBJECTS)
+libgpgme03_la_OBJECTS = $(am_libgpgme03_la_OBJECTS)
 SCRIPTS = $(bin_SCRIPTS)
 
 
@@ -278,14 +278,14 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(am__libgpgme_la_SOURCES_DIST)
+DIST_SOURCES = $(am__libgpgme03_la_SOURCES_DIST)
 DATA = $(m4data_DATA)
 
 HEADERS = $(include_HEADERS)
 
 DIST_COMMON = $(include_HEADERS) ChangeLog Makefile.am Makefile.in \
 	fopencookie.c gpgme-config.in stpcpy.c vasprintf.c
-SOURCES = $(libgpgme_la_SOURCES)
+SOURCES = $(libgpgme03_la_SOURCES)
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -327,8 +327,8 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgpgme.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libgpgme_la_LDFLAGS) $(libgpgme_la_OBJECTS) $(libgpgme_la_LIBADD) $(LIBS)
+libgpgme03.la: $(libgpgme03_la_OBJECTS) $(libgpgme03_la_DEPENDENCIES) 
+	$(LINK) -rpath $(libdir) $(libgpgme03_la_LDFLAGS) $(libgpgme03_la_OBJECTS) $(libgpgme03_la_LIBADD) $(LIBS)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -336,7 +336,7 @@ install-binSCRIPTS: $(bin_SCRIPTS)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    f=`echo "$$p" | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|'`; \
 	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
 	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -345,7 +345,7 @@ install-binSCRIPTS: $(bin_SCRIPTS)
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  f=`echo "$$p" | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|''`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
@@ -450,7 +450,7 @@ install-m4dataDATA: $(m4data_DATA)
 	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
 	@list='$(m4data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f="`echo $$p | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|'`"; \
 	  echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \
 	  $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \
 	done
@@ -468,7 +468,7 @@ install-includeHEADERS: $(include_HEADER
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f="`echo $$p | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|'`"; \
 	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
 	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
 	done