- add SEPARATE_BUILD to Makefile
- set DATADIRNAME in autoconf script to the right value and partially remove an unnecessary patch to po/Makefile.in.in
This commit is contained in:
parent
435b203e6c
commit
8e8a7cc25b
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.38 2000/07/12 17:55:58 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.39 2000/08/27 17:36:12 brad Exp $
|
||||
|
||||
DISTNAME= gtk+-1.2.8
|
||||
CATEGORIES= x11 devel
|
||||
NEED_VERSION= 1.310
|
||||
NEED_VERSION= 1.320
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
|
||||
http://www.ameth.org/gimp/gtk/v1.2/
|
||||
@ -19,6 +19,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- configure.orig Wed May 24 20:31:48 2000
|
||||
+++ configure Wed Jun 21 06:05:15 2000
|
||||
@@ -4099,7 +4099,7 @@
|
||||
|
||||
# AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
|
||||
# this is the directory where the *.{mo,gmo} files are installed
|
||||
-gtklocaledir='${prefix}/${DATADIRNAME}/locale'
|
||||
+gtklocaledir='${prefix}/share/locale'
|
||||
|
||||
|
||||
echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
|
||||
+++ configure Sun Aug 27 00:25:22 2000
|
||||
@@ -3726,7 +3726,7 @@
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CATOBJEXT=.mo
|
||||
- DATADIRNAME=lib
|
||||
+ DATADIRNAME=share
|
||||
fi
|
||||
rm -f conftest*
|
||||
INSTOBJEXT=.mo
|
||||
|
@ -1,14 +1,5 @@
|
||||
--- po/Makefile.in.in.orig Wed Feb 16 06:27:59 2000
|
||||
+++ po/Makefile.in.in Sat Mar 11 21:13:37 2000
|
||||
@@ -19,7 +19,7 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datadir = $(prefix)/@DATADIRNAME@
|
||||
-localedir = $(datadir)/locale
|
||||
+localedir = $(prefix)/share/locale
|
||||
gnulocaledir = $(prefix)/share/locale
|
||||
gettextsrcdir = $(prefix)/share/gettext/po
|
||||
subdir = po
|
||||
--- po/Makefile.in.in.orig Wed May 24 20:31:44 2000
|
||||
+++ po/Makefile.in.in Sun Aug 27 00:26:19 2000
|
||||
@@ -69,7 +69,7 @@
|
||||
$(MSGFMT) -o $@ $<
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user