pkg://jpilot-0.99.2-11.src.rpm:873877/jpilot-0.99.2-config.patch  info  downloads

--- jpilot-0.99.2/Expense/Makefile.in.config	2002-01-25 13:59:36.000000000 -0500
+++ jpilot-0.99.2/Expense/Makefile.in	2002-11-10 16:46:01.000000000 -0500
@@ -30,7 +30,7 @@
 	$(LIBTOOL) --mode=link \
 	$(CC) $(OPTIONS) -o libexpense.la \
 	expense.lo \
-	-rpath $(prefix)/lib/jpilot/plugins \
+	-rpath $(libdir)/jpilot/plugins \
 	-version-info 1:1 \
 	-avoid-version
 
@@ -53,10 +53,10 @@
 # ~/.jpilot/plugins
 #
 install:
-	$(INSTALL) -d -m 755 $(prefix)/lib/jpilot; \
-	$(INSTALL) -d -m 755 $(prefix)/lib/jpilot/plugins; \
+	$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)/jpilot; \
+	$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)/jpilot/plugins; \
 	$(LIBTOOL) --mode=install $(INSTALL) \
-	libexpense.la $(prefix)/lib/jpilot/plugins
+	libexpense.la $(DESTDIR)$(libdir)/jpilot/plugins
 
 local_install:
 	$(INSTALL) -d -m 755 $(HOME)/.jpilot; \
--- jpilot-0.99.2/SyncTime/Makefile.in.config	2002-01-25 13:59:50.000000000 -0500
+++ jpilot-0.99.2/SyncTime/Makefile.in	2002-11-10 16:46:01.000000000 -0500
@@ -32,7 +32,7 @@
 	$(LIBTOOL) --mode=link \
 	$(CC) $(OPTIONS) -o libsynctime.la \
 	synctime.lo \
-	-rpath $(prefix)/lib/jpilot/plugins \
+	-rpath $(libdir)/jpilot/plugins \
 	-version-info 1:1 \
 	-avoid-version
 
@@ -55,10 +55,10 @@
 # ~/.jpilot/plugins
 #
 install:
-	$(INSTALL) -d -m 755 $(prefix)/lib/jpilot; \
-	$(INSTALL) -d -m 755 $(prefix)/lib/jpilot/plugins; \
+	$(INSTALL) -d -m 755 $(libdir)/jpilot; \
+	$(INSTALL) -d -m 755 $(libdir)/jpilot/plugins; \
 	$(LIBTOOL) --mode=install $(INSTALL) \
-	libsynctime.la $(prefix)/lib/jpilot/plugins
+	libsynctime.la $(libdir)/jpilot/plugins
 
 local_install:
 	$(INSTALL) -d -m 755 $(HOME)/.jpilot; \
--- jpilot-0.99.2/KeyRing/Makefile.in.config	2002-01-25 14:00:06.000000000 -0500
+++ jpilot-0.99.2/KeyRing/Makefile.in	2002-11-10 16:46:01.000000000 -0500
@@ -33,7 +33,7 @@
 	$(LIBTOOL) --mode=link \
 	$(CC) $(OPTIONS) -o libkeyring.la \
 	keyring.lo \
-	-rpath $(prefix)/lib/jpilot/plugins \
+	-rpath $(libdir)/jpilot/plugins \
 	-version-info 1:1 \
 	-avoid-version \
 	$(CRYPTO_LIBS)
@@ -57,10 +57,10 @@
 # ~/.jpilot/plugins
 #
 install:
-	$(INSTALL) -d -m 755 $(prefix)/lib/jpilot; \
-	$(INSTALL) -d -m 755 $(prefix)/lib/jpilot/plugins; \
+	$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)/jpilot; \
+	$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)/jpilot/plugins; \
 	$(LIBTOOL) --mode=install $(INSTALL) \
-	libkeyring.la $(prefix)/lib/jpilot/plugins
+	libkeyring.la $(DESTDIR)$(libdir)/jpilot/plugins
 
 local_install:
 	$(INSTALL) -d -m 755 $(HOME)/.jpilot; \
--- jpilot-0.99.2/Makefile.in.config	2002-02-06 01:29:18.000000000 -0500
+++ jpilot-0.99.2/Makefile.in	2002-11-10 16:46:01.000000000 -0500
@@ -396,24 +396,24 @@
 
 install: all $(install_plugins_$(PLUGIN_SUPPORT)) $(install_keyring_$(MAKE_KEYRING))
 	if test -d "$(prefix)/bin" ; then \
-	  $(INSTALL) -s -m 555 jpilot $(prefix)/bin/jpilot ; \
+	  $(INSTALL) -m 555 jpilot $(prefix)/bin/jpilot ; \
 	else \
-	  $(INSTALL) -s -m 555 jpilot $(prefix)/jpilot ; \
+	  $(INSTALL) -m 555 jpilot $(prefix)/jpilot ; \
 	fi
 	if test -d "$(prefix)/bin" ; then \
-	  $(INSTALL) -s -m 555 jpilot-sync $(prefix)/bin/jpilot-sync ; \
+	  $(INSTALL) -m 555 jpilot-sync $(prefix)/bin/jpilot-sync ; \
 	else \
-	  $(INSTALL) -s -m 555 jpilot-sync $(prefix)/jpilot-sync ; \
+	  $(INSTALL) -m 555 jpilot-sync $(prefix)/jpilot-sync ; \
 	fi
 	if test -d "$(prefix)/bin" ; then \
-	  $(INSTALL) -s -m 555 jpilot-dump $(prefix)/bin/jpilot-dump ; \
+	  $(INSTALL) -m 555 jpilot-dump $(prefix)/bin/jpilot-dump ; \
 	else \
-	  $(INSTALL) -s -m 555 jpilot-dump $(prefix)/jpilot-dump ; \
+	  $(INSTALL) -m 555 jpilot-dump $(prefix)/jpilot-dump ; \
 	fi
 	if test -d "$(prefix)/bin" ; then \
-	  $(INSTALL) -s -m 555 jpilot-dump $(prefix)/bin/jpilot-upgrade-99 ; \
+	  $(INSTALL) -m 555 jpilot-dump $(prefix)/bin/jpilot-upgrade-99 ; \
 	else \
-	  $(INSTALL) -s -m 555 jpilot-dump $(prefix)/jpilot-upgrade-99 ; \
+	  $(INSTALL) -m 555 jpilot-dump $(prefix)/jpilot-upgrade-99 ; \
 	fi
 	$(INSTALL) -d -m 755 $(prefix)/share/$(PACKAGE)
 	$(INSTALL) -m 644 jpilotrc.blue $(prefix)/share/$(PACKAGE)
@@ -440,7 +440,7 @@
 	$(INSTALL) -m 644 docs/jpilot-search.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
 	$(INSTALL) -m 644 docs/jpilot-todo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
 	$(INSTALL) -m 644 docs/jpilot-toplogo.jpg $(prefix)/doc/$(PACKAGE)-$(VERSION)
-	$(INSTALL) -d -m 644 $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons
+	$(INSTALL) -d -m 755 $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons
 	$(INSTALL) -m 644 icons/README $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/README
 	$(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
 	$(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
--- jpilot-0.99.2/configure.config	2002-11-10 16:47:33.000000000 -0500
+++ jpilot-0.99.2/configure	2002-11-10 16:49:06.000000000 -0500
@@ -2725,7 +2725,7 @@
 # This must be Linux ELF.
 linux-gnu*)
   case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64 | s390* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
@@ -9351,7 +9351,7 @@
 
 if test $pilotlibs = no ; then
 for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
-  /usr/extra/pilot/lib ; do
+  /usr/extra/pilot/lib /usr/lib64 ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"