33 lines
1.2 KiB
Text
33 lines
1.2 KiB
Text
$NetBSD: patch-ab,v 1.8 2014/01/25 00:01:21 kleink Exp $
|
|
|
|
--- tcltk/Makefile.in.orig 2000-07-14 17:39:55.000000000 +0200
|
|
+++ tcltk/Makefile.in 2014-01-24 22:54:38.000000000 +0100
|
|
@@ -96,7 +96,7 @@ HFLAGS = @HFLAGS@
|
|
|
|
X11_INCLUDE_FLAGS = @XINCLUDES@
|
|
|
|
-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS)
|
|
+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(LOCALBASE)/include/tcl/generic -I$(LOCALBASE)/include/tk/generic $(X11_INCLUDE_FLAGS) -DUSE_INTERP_RESULT
|
|
|
|
.c.o:
|
|
$(CC) -c $(ALL_CFLAGS) $<
|
|
@@ -125,8 +125,8 @@ libtkiapp.a: tkiapp.o
|
|
install: all install-only
|
|
|
|
install-only:
|
|
- $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(datadir)
|
|
- $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(datadir)
|
|
+ $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(DESTDIR)$(datadir)
|
|
+ $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(DESTDIR)$(datadir)
|
|
|
|
# Usual cleaning, and flushing of anything junk-like.
|
|
|
|
@@ -140,7 +140,7 @@ distclean: clean
|
|
realclean: distclean
|
|
|
|
Makefile: $(srcdir)/Makefile.in
|
|
- cd .. \
|
|
+ cd .. \
|
|
&& CONFIG_FILES=tcltk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
# All the .h dependencies.
|