summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeiichirou Hiraoka <flathill@FreeBSD.org>1999-05-09 15:21:01 +0000
committerSeiichirou Hiraoka <flathill@FreeBSD.org>1999-05-09 15:21:01 +0000
commit14d0ad84638838a091084651982fa477444c7904 (patch)
tree8f32af05f3f45c83c4aa1393479525f783c9e71d
parentUpdate 2.3 -> 2.4 (diff)
Fix HELPDIR in patch-aa and
DEFAULT_HELPPATH in patch-ac Now this can make package
Notes
Notes: svn path=/head/; revision=18636
-rw-r--r--deskutils/xopps/files/patch-aa4
-rw-r--r--deskutils/xopps/files/patch-ac4
-rw-r--r--deskutils/xopps/pkg-plist2
3 files changed, 5 insertions, 5 deletions
diff --git a/deskutils/xopps/files/patch-aa b/deskutils/xopps/files/patch-aa
index 92185f602626..4d7e826c1c45 100644
--- a/deskutils/xopps/files/patch-aa
+++ b/deskutils/xopps/files/patch-aa
@@ -7,14 +7,14 @@
-ROOTDIR = ### user defined ###
-SUBSYS = ### user defined ###
+ROOTDIR = $(PREFIX)
-+SUBSYS = ..
++SUBSYS =
BINDIR = $(ROOTDIR)/bin
-RSCDIR = $(ROOTDIR)/setup/app-defaults
+RSCDIR = $(ROOTDIR)/lib/X11/app-defaults
MAN1DIR = $(ROOTDIR)/man/man1
-HELPDIR = $(ROOTDIR)/setup/$(SUBSYS)/help
-BITDIR = $(ROOTDIR)/setup/bitmaps
-+HELPDIR = $(ROOTDIR)/lib/X11/$(SUBSYS)/help
++HELPDIR = $(ROOTDIR)/info
+BITDIR = $(ROOTDIR)/include/X11/bitmaps
#
diff --git a/deskutils/xopps/files/patch-ac b/deskutils/xopps/files/patch-ac
index 6befc0898740..250ac566a6ef 100644
--- a/deskutils/xopps/files/patch-ac
+++ b/deskutils/xopps/files/patch-ac
@@ -5,10 +5,10 @@
*/
#ifdef DEBUG
-#define DEFAULT_HELPPATH ".:/usr/lib/help:/usr/local/lib/help"
-+#define DEFAULT_HELPPATH ".:/usr/X11R6/lib/help:/usr/local/lib/help"
++#define DEFAULT_HELPPATH ".:/usr/X11R6/help:/usr/local/help"
#else
-#define DEFAULT_HELPPATH "/usr/lib/help:/usr/local/lib/help"
-+#define DEFAULT_HELPPATH "/usr/X11R6/lib/help:/usr/local/lib/help"
++#define DEFAULT_HELPPATH "/usr/X11R6/help:/usr/local/help"
#endif
/***********************************************************************
diff --git a/deskutils/xopps/pkg-plist b/deskutils/xopps/pkg-plist
index 028d71e3ad39..30e81e86479b 100644
--- a/deskutils/xopps/pkg-plist
+++ b/deskutils/xopps/pkg-plist
@@ -2,5 +2,5 @@ bin/xopps
bin/opps2xopps
include/X11/bitmaps/jpl1.bm
include/X11/bitmaps/jpl2.bm
-lib/help/xopps.info
+info/xopps.info
lib/X11/app-defaults/XOpps