don't use gnu dest, instead make this port DESTDIR aware.
this unbust plugins. discussed and ok by pvalchev@.
This commit is contained in:
parent
03df7eaff7
commit
735170595a
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2002/10/25 11:34:24 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2003/03/03 03:01:58 fgsch Exp $
|
||||
|
||||
COMMENT= "desktop organizer software for the palm pilot"
|
||||
|
||||
@ -26,7 +26,7 @@ LIB_DEPENDS= pisock.3:pilot-link-*:comms/pilot-link \
|
||||
MODULES= gettext
|
||||
|
||||
USE_X11= Yes
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
CFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
12
comms/jpilot/patches/patch-Expense_Makefile_in
Normal file
12
comms/jpilot/patches/patch-Expense_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-Expense_Makefile_in,v 1.5 2003/03/03 03:01:59 fgsch Exp $
|
||||
--- Expense/Makefile.in.orig Sun Mar 2 04:16:24 2003
|
||||
+++ Expense/Makefile.in Sun Mar 2 04:16:30 2003
|
||||
@@ -2,7 +2,7 @@ top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_srcdir@
|
||||
|
||||
# Install variables
|
||||
-prefix=@prefix@
|
||||
+prefix=${PREFIX}
|
||||
|
||||
#Pilot flags (include dir), and Libraries
|
||||
PILOT_FLAGS=@PILOT_FLAGS@
|
12
comms/jpilot/patches/patch-KeyRing_Makefile_in
Normal file
12
comms/jpilot/patches/patch-KeyRing_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-KeyRing_Makefile_in,v 1.1 2003/03/03 03:01:59 fgsch Exp $
|
||||
--- KeyRing/Makefile.in.orig Sun Mar 2 04:17:42 2003
|
||||
+++ KeyRing/Makefile.in Sun Mar 2 04:17:49 2003
|
||||
@@ -2,7 +2,7 @@ top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_srcdir@
|
||||
|
||||
# Install variables
|
||||
-prefix=@prefix@
|
||||
+prefix=${PREFIX}
|
||||
|
||||
#Pilot flags (include dir), and Libraries
|
||||
PILOT_FLAGS=@PILOT_FLAGS@
|
@ -1,7 +1,21 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2002/02/18 23:41:43 pvalchev Exp $
|
||||
--- Makefile.in.orig Tue Feb 5 23:29:18 2002
|
||||
+++ Makefile.in Mon Feb 18 16:23:52 2002
|
||||
@@ -118,7 +118,7 @@ prefix=@prefix@
|
||||
$OpenBSD: patch-Makefile_in,v 1.3 2003/03/03 03:01:59 fgsch Exp $
|
||||
--- Makefile.in.orig Wed Feb 6 03:29:18 2002
|
||||
+++ Makefile.in Sun Mar 2 00:17:17 2003
|
||||
@@ -3,6 +3,8 @@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
|
||||
top_srcdir = @top_srcdir@
|
||||
@@ -114,11 +116,11 @@ JPILOT_MISC = ABOUT-NLS \
|
||||
SRC = $(JPILOT_SRC) $(JPILOT_SRC_HDRS) $(JPILOT_IMAGES) $(JPILOT_MISC) $(SUBDIRS)
|
||||
|
||||
# Install variables
|
||||
-prefix=@prefix@
|
||||
+prefix=$(DESTDIR)@prefix@
|
||||
mandir=@mandir@
|
||||
|
||||
datadir = $(prefix)/@DATADIRNAME@
|
||||
@ -10,7 +24,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2002/02/18 23:41:43 pvalchev Exp $
|
||||
gnulocaledir = $(prefix)/share/locale
|
||||
|
||||
#Pilot flags (include dir), and Libraries
|
||||
@@ -427,39 +427,22 @@ install: all $(install_plugins_$(PLUGIN_
|
||||
@@ -427,39 +429,22 @@ install: all $(install_plugins_$(PLUGIN_
|
||||
$(INSTALL) -m 644 empty/MemoDB.pdb $(prefix)/share/$(PACKAGE)/
|
||||
$(INSTALL) -m 644 empty/Memo32DB.pdb $(prefix)/share/$(PACKAGE)/
|
||||
$(INSTALL) -m 644 empty/ExpenseDB.pdb $(prefix)/share/$(PACKAGE)/
|
||||
|
12
comms/jpilot/patches/patch-SyncTime_Makefile_in
Normal file
12
comms/jpilot/patches/patch-SyncTime_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-SyncTime_Makefile_in,v 1.5 2003/03/03 03:01:59 fgsch Exp $
|
||||
--- SyncTime/Makefile.in.orig Sun Mar 2 00:23:50 2003
|
||||
+++ SyncTime/Makefile.in Sun Mar 2 00:23:56 2003
|
||||
@@ -2,7 +2,7 @@ top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_srcdir@
|
||||
|
||||
# Install variables
|
||||
-prefix=@prefix@
|
||||
+prefix=${PREFIX}
|
||||
|
||||
#Pilot flags (include dir), and Libraries
|
||||
PILOT_FLAGS=@PILOT_FLAGS@
|
Loading…
Reference in New Issue
Block a user