109 lines
3.5 KiB
Text
109 lines
3.5 KiB
Text
$NetBSD: patch-ac,v 1.9 2010/10/03 10:43:03 obache Exp $
|
|
|
|
--- x11/Makefile.in.orig 2000-08-22 12:52:56.000000000 +0000
|
|
+++ x11/Makefile.in
|
|
@@ -25,10 +25,10 @@ VPATH = @srcdir@
|
|
krnsrcdir = $(srcdir)/../kernel
|
|
|
|
GAMEUID = games
|
|
-GAMEGRP = bin
|
|
+GAMEGRP = games
|
|
|
|
-GAMEPERM = 04755
|
|
-DIRPERM = 0755
|
|
+GAMEPERM = 02755
|
|
+DIRPERM = 0775
|
|
FILEPERM = 0644
|
|
|
|
SHELL = /bin/sh
|
|
@@ -49,7 +49,7 @@ XAW_LIB = -lXaw -lXt $(X11_LIB) -lXext -
|
|
|
|
#TCLTK_LIB = -ltk -ltcl -ldl -lm
|
|
#TCLTK_LIB = ../tcl/unix/libtcl8.0.a ../tk/unix/libtk8.0.a -ldl -lm
|
|
-TCLTK_LIB = $(TCL) $(TK)
|
|
+TCLTK_LIB = $(TCL) $(TK) -Wl,-R$(libdir)
|
|
|
|
# Extra flags that the TCLTK files need:
|
|
TCLTK_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS)
|
|
@@ -65,14 +65,14 @@ LIB_INSTALL_DIR = $(libdir)
|
|
# This variable is needed when doing dynamic linking.
|
|
LIB_RUNTIME_DIR = $(libdir)
|
|
TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@
|
|
-TCL_CFLAGS = @TCLHDIR@
|
|
+TCL_CFLAGS = -I${LOCALBASE}/include
|
|
TCL_DEPS =
|
|
|
|
TCL_DL_LIBS = @TCL_DL_LIBS@
|
|
|
|
# Tk stuff.
|
|
TK = @TK_LIB_SPEC@
|
|
-TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
|
|
+TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@
|
|
TK_DEPS =
|
|
|
|
X11_CFLAGS = @TK_XINCLUDES@
|
|
@@ -81,7 +81,7 @@ X11_LIBS =
|
|
|
|
GUI_CFLAGS_X = @GUI_CFLAGS_X@
|
|
|
|
-X11_LIB_FLAGS = @XLIBS@
|
|
+X11_LIB_FLAGS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib
|
|
|
|
# Override this to disable SelFile calls.
|
|
|
|
@@ -154,7 +154,7 @@ HFLAGS = @HFLAGS@
|
|
|
|
X11_INCLUDE_FLAGS = @XINCLUDES@
|
|
|
|
-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS)
|
|
+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS) $(TCLTK_CFLAGS)
|
|
|
|
.c.o:
|
|
$(CC) -c $(ALL_CFLAGS) $<
|
|
@@ -209,20 +209,20 @@ install: all install-only
|
|
|
|
install-only:
|
|
srcroot=`cd $(srcroot); pwd`; export srcroot; \
|
|
- $(INSTALL_PROGRAM) xconq $(bindir); \
|
|
- chown $(GAMEUID) $(bindir)/xconq; \
|
|
- chgrp $(GAMEGRP) $(bindir)/xconq; \
|
|
- chmod $(GAMEPERM) $(bindir)/xconq; \
|
|
- $(INSTALL_PROGRAM) imf2x $(bindir); \
|
|
- $(INSTALL_PROGRAM) x2imf $(bindir); \
|
|
- $(INSTALL_PROGRAM) ximfapp $(bindir); \
|
|
- $(INSTALL_DATA) xconq.6 $(man6dir)
|
|
+ $(INSTALL_PROGRAM) xconq $(DESTDIR)$(bindir); \
|
|
+ #chown $(GAMEUID) $(DESTDIR)$(bindir)/xconq; \
|
|
+ #chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xconq; \
|
|
+ #chmod $(GAMEPERM) $(DESTDIR)$(bindir)/xconq; \
|
|
+ $(INSTALL_PROGRAM) imf2x $(DESTDIR)$(bindir); \
|
|
+ $(INSTALL_PROGRAM) x2imf $(DESTDIR)$(bindir); \
|
|
+ $(INSTALL_PROGRAM) ximfapp $(DESTDIR)$(bindir); \
|
|
+ $(INSTALL_DATA) xconq.6 $(DESTDIR)$(man6dir)
|
|
|
|
install-xshowimf:
|
|
srcroot=`cd $(srcroot); pwd`; export srcroot; \
|
|
- $(INSTALL_PROGRAM) xshowimf $(bindir); \
|
|
- $(INSTALL_DATA) XShowimf $(appdefaultsdir); \
|
|
- $(INSTALL_DATA) XShowimf-color $(appdefaultsdir); \
|
|
+ $(INSTALL_PROGRAM) xshowimf $(DESTDIR)$(bindir); \
|
|
+ $(INSTALL_DATA) XShowimf $(DESTDIR)$(appdefaultsdir); \
|
|
+ $(INSTALL_DATA) XShowimf-color $(DESTDIR)$(appdefaultsdir); \
|
|
|
|
# Cleanliness support.
|
|
|
|
@@ -240,11 +240,11 @@ extraclean: distclean
|
|
realclean: distclean
|
|
|
|
Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag)
|
|
- cd .. \
|
|
+ cd .. \
|
|
&& CONFIG_FILES=x11/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
# Dependencies.
|
|
|
|
xconq.o: $(ALL_H) $(krnsrcdir)/cmdline.h $(srcdir)/../tcltk/tkconq.h
|
|
|
|
-ximfapp.o: $(LOW_H) $(krnsrcdir)/imf.h
|
|
\ No newline at end of file
|
|
+ximfapp.o: $(LOW_H) $(krnsrcdir)/imf.h
|