app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch

   1 * Modify Makefile.am's to be compliant with GNU and Gentoo filesystem conventions
   2 * Use redefinable variables instead of hard-replacing @VAR@-style variables
   3 * Replace abuse of 'libdir' install path variables
   4
   5 --- a/docs/Makefile.am
   6 +++ b/docs/Makefile.am
   7 @@ -3,19 +3,17 @@
   8  man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1 jpilot-merge.1
   9
  10  # Install the standard GNU doc files
  11 -miscdir = $(datadir)/doc/$(PACKAGE)
  12 +miscdir = $(docdir)
  13  misc_DATA = \
  14         ../BUGS \
  15         ../ChangeLog \
  16 -       ../COPYING \
  17         ../AUTHORS \
  18 -       ../INSTALL \
  19         ../README \
  20         ../TODO
  21
  22  # Install the manual docs
  23 -docdir = $(miscdir)/manual
  24 -doc_DATA = \
  25 +manualdir = $(htmldir)
  26 +manual_DATA = \
  27         manual.html \
  28         plugin.html \
  29         jpilot-address.png \
  30 --- a/Expense/Makefile.am
  31 +++ b/Expense/Makefile.am
  32 @@ -1,11 +1,11 @@
  33 -libdir = @libdir@/@PACKAGE@/plugins
  34 +pluginsdir = $(libdir)/$(PACKAGE)/plugins
  35
  36  if MAKE_EXPENSE
  37
  38 -lib_LTLIBRARIES = libexpense.la
  39 +plugins_LTLIBRARIES = libexpense.la
  40  libexpense_la_SOURCES = expense.c
  41 -libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
  42 +libexpense_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
  43  libexpense_la_LDFLAGS = -module -avoid-version
  44 -libexpense_la_LIBADD = @GTK_LIBS@
  45 +libexpense_la_LIBADD = $(GTK_LIBS)
  46
  47  endif
  48 --- a/icons/Makefile.am
  49 +++ b/icons/Makefile.am
  50 @@ -1,4 +1,4 @@
  51 -icondir = $(datadir)/doc/$(PACKAGE)/icons
  52 +icondir = $(docdir)/icons
  53  icon_DATA = \
  54         jpilot-icon1.xpm \
  55         jpilot-icon2.xpm \
  56 --- a/KeyRing/Makefile.am
  57 +++ b/KeyRing/Makefile.am
  58 @@ -1,13 +1,13 @@
  59 -libdir = @libdir@/@PACKAGE@/plugins
  60 +pluginsdir = $(libdir)/$(PACKAGE)/plugins
  61
  62  EXTRA_DIST = README
  63
  64  if MAKE_KEYRING
  65
  66 -lib_LTLIBRARIES = libkeyring.la
  67 +plugins_LTLIBRARIES = libkeyring.la
  68  libkeyring_la_SOURCES = keyring.c
  69 -libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ @LIBGCRYPT_CFLAGS@ -I$(top_srcdir)
  70 +libkeyring_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) $(LIBGCRYPT_CFLAGS) -I$(top_srcdir)
  71  libkeyring_la_LDFLAGS = -module -avoid-version
  72 -libkeyring_la_LIBADD = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
  73 +libkeyring_la_LIBADD = $(OPENSSL_LIBS) $(GTK_LIBS) $(LIBGCRYPT_LIBS)
  74
  75  endif
  76 --- a/Makefile.am
  77 +++ b/Makefile.am
  78 @@ -161,18 +161,17 @@
  79  ACLOCAL_AMFLAGS = -I m4
  80
  81  # Add i18n support
  82 -localedir = $(datadir)/locale
  83  I18NDEFS = -DLOCALEDIR=\"$(localedir)\"
  84
  85 -AM_CFLAGS= @PILOT_FLAGS@ @GTK_CFLAGS@ ${I18NDEFS}
  86 +AM_CFLAGS= $(PILOT_FLAGS) $(GTK_CFLAGS) $(I18NDEFS)
  87
  88  # Add linkflags
  89  jpilot_LDFLAGS = -export-dynamic
  90 -jpilot_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
  91 -jpilot_dump_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
  92 +jpilot_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
  93 +jpilot_dump_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
  94  jpilot_sync_LDFLAGS = -export-dynamic
  95 -jpilot_sync_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
  96 -jpilot_merge_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
  97 +jpilot_sync_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
  98 +jpilot_merge_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
  99
 100  ################################################################################
 101  ## The rest of the file is copied over to the Makefile with only variable
 102 --- a/SyncTime/Makefile.am
 103 +++ b/SyncTime/Makefile.am
 104 @@ -1,11 +1,11 @@
 105 -libdir = @libdir@/@PACKAGE@/plugins
 106 +pluginsdir = $(libdir)/$(PACKAGE)/plugins
 107
 108  if MAKE_SYNCTIME
 109
 110 -lib_LTLIBRARIES = libsynctime.la
 111 +plugins_LTLIBRARIES = libsynctime.la
 112  libsynctime_la_SOURCES = synctime.c
 113 -libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
 114 +libsynctime_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
 115  libsynctime_la_LDFLAGS = -module -avoid-version
 116 -libsynctime_la_LIBADD = @GTK_LIBS@
 117 +libsynctime_la_LIBADD = $(GTK_LIBS)
 118
 119  endif