aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits/gtk12/files/patch-aa
blob: f9811e5de7d3221497fe0d4f38cbb5d58fe2912c (plain) (blame)
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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
--- Makefile.in.orig    Wed Aug  5 13:06:11 1998
+++ Makefile.in Wed Aug 12 17:58:02 1998
@@ -91,9 +91,9 @@
 xinput_progs = @xinput_progs@
 
 SRC_SUBDIRS = gdk gtk
-SUBDIRS = $(SRC_SUBDIRS) docs
+SUBDIRS = $(SRC_SUBDIRS)
 
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk11-config
 
 EXTRA_DIST =   \
    HACKING     \
@@ -169,12 +169,12 @@
    examples/wheelbarrow/wheelbarrow.c  \
    examples/find-examples.sh
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk.m4
+m4datadir = $(PREFIX)/share/aclocal
+m4data_DATA = gtk11.m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  gtk-config
+CONFIG_CLEAN_FILES =  gtk11-config
 SCRIPTS =  $(bin_SCRIPTS)
 
 DATA =  $(m4data_DATA)
@@ -227,8 +227,14 @@
    -rm -f config.h
 
 maintainer-clean-hdr:
-gtk-config: $(top_builddir)/config.status gtk-config.in
-   cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+gtk11.m4: gtk.m4
+   cp gtk.m4 gtk11.m4
+
+gtk11-config.in: gtk-config.in
+   cp gtk-config.in gtk11-config.in
+
+gtk11-config: $(top_builddir)/config.status gtk11-config.in
+   cd $(top_builddir) && CONFIG_FILES=gtk11-config CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
    @$(NORMAL_INSTALL)
--- gtk/Makefile.in.orig    Wed Aug  5 13:06:16 1998
+++ gtk/Makefile.in Wed Aug 12 17:47:57 1998
@@ -433,7 +433,7 @@
 SOURCES = $(libgtk_1_1_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
 OBJECTS = $(libgtk_1_1_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s