blob: 33fefc50090d87225103845712ee702c8cf0c6e2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-ac,v 1.3 2000/02/29 18:31:30 jlam Exp $
--- src/config/abi_defs.mk.orig Tue Jan 11 06:46:50 2000
+++ src/config/abi_defs.mk Tue Feb 29 12:05:03 2000
@@ -296,7 +296,7 @@
## a date stamp in a nightly build system).
##
-ABI_BUILD_VERSION = unnumbered
+ABI_BUILD_VERSION ?= unnumbered
ABI_BUILD_ID =
##################################################################
@@ -353,14 +353,18 @@
ifeq ($(ABI_NATIVE),unix)
ifdef ABI_OPT_GNOME
-CFLAGS += `$(GNOME_CONFIG) --cflags gnorba gnomeui` -DHAVE_GNOME
-EXTRA_LIBS += `$(GNOME_CONFIG) --libs gnorba gnomeui`
+GNOME_CFLAGS := $(shell $(GNOME_CONFIG) --cflags gnorba gnomeui)
+GNOME_LIBS := $(shell $(GNOME_CONFIG) --libs gnorba gnomeui)
+CFLAGS += $(GNOME_CFLAGS) -DHAVE_GNOME
+EXTRA_LIBS += $(GNOME_LIBS)
ABI_GNOME_DIR = gnome
ABI_GNOME_PREFIX = Gnome
ABI_OPTIONS+=Gnome:On
else
-CFLAGS += `$(GTK_CONFIG) --cflags`
-EXTRA_LIBS += `$(GTK_CONFIG) --libs`
+GTK_CFLAGS := $(shell $(GTK_CONFIG) --cflags)
+GTK_LIBS := $(shell $(GTK_CONFIG) --libs)
+CFLAGS += $(GTK_CFLAGS)
+EXTRA_LIBS += $(GTK_LIBS)
ABI_OPTIONS+=Gnome:Off
endif
endif
|
