File jpilot-Backup-0.51-config.dif of Package jpilot-Backup

Overview Repositories Revisions Requests Users Attributes Meta

File jpilot-Backup-0.51-config.dif of Package jpilot-Backup

Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -19764,7 +19764,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $pilot_prefix/lib64 /usr/lib /usr/lib64 /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -64,7 +64,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $pilot_prefix/lib64 /usr/lib /usr/lib64 /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -12,7 +12,7 @@ libbackup_la_SOURCES = \
 
 libbackup_la_LDFLAGS = -avoid-version
 libbackup_la_LIBADD = @LIBS@ @PILOT_LIBS@ @GTK_LIBS@
-libdir = $(prefix)/lib/jpilot/plugins
+libbackupdir = $(libdir)/jpilot/plugins
 
 AM_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@
 
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -52,7 +52,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
+am__installdirs = "$(DESTDIR)$(libbackupdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libbackup_la_DEPENDENCIES =
@@ -171,7 +171,7 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/jpilot/plugins
+libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
@@ -199,6 +199,7 @@ libbackup_la_SOURCES = \
 
 libbackup_la_LDFLAGS = -avoid-version
 libbackup_la_LIBADD = @LIBS@ @PILOT_LIBS@ @GTK_LIBS@
+libbackupdir = $(libdir)/jpilot/plugins
 AM_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@
 all: all-am
 
@@ -235,12 +236,12 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libbackupdir)" || $(mkdir_p) "$(DESTDIR)$(libbackupdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libbackupdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libbackupdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -248,8 +249,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libbackupdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libbackupdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -384,7 +385,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(libbackupdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am

Places

File jpilot-Backup-0.51-config.dif of Package jpilot-Backup

Places