This is the mail archive of the
xconq7@sourceware.cygnus.com
mailing list for the Xconq project.
Re: xc7.1.93
- To: Keir Novik <ken21@cam.ac.uk>
- Subject: Re: xc7.1.93
- From: Steve Robbins <steve@nyongwa.montreal.qc.ca>
- Date: Mon, 16 Feb 1998 20:01:02 -0500 (EST)
- cc: Xconq 7 Mailing List <xconq7@cygnus.com>
Hi all,
I did a quick stab at compiling last week; it failed, so I put it aside.
On Sun, 15 Feb 1998, Keir Novik wrote:
> This has probably been the case since time immemorial: if we
>
> ./configure --prefix=/blorb
> make all-xconq
> make install-xconq
>
> and the directories /blorb/lib/xconqdir/lib and
> /blorb/lib/xconqdir/lib-x11 don't exist, then the directories aren't
> created but all the lib files are copied over each other.
Ah, good. It wasn't just me. :)
After a bit of cut'n'paste, I think I've fixed this problem; see the
attached diff. I also fixed config/mh-linux, which used to set
X11_LIB_FLAGS, but not X11_INCLUDE_FLAGS. (if you set one, chances are
you have to set both!)
By the by: it appears that editing *some* of the Makefile.in's (like
x11/Makefile.in) will cause a top-level "make" to rebuild the associated
Makefile, but touching some others (say lib/Makefile.in) does NOT cause
the rebuild. I didn't check any more deeply than this.
--
Steve Robbins <steve@nyongwa.montreal.qc.ca>
When I was dead, I wore a strong perfume.
When I was dead, I never left the room.
--- Makefile.in 1998/02/16 23:26:47 1.1
+++ Makefile.in 1998/02/16 23:27:10
@@ -11,7 +11,7 @@
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
libdir = $(exec_prefix)/lib
-datadir = $(prefix)/lib/xconq
+datadir = $(prefix)/lib/xconqdir
mandir = $(prefix)/man
man6dir = $(mandir)/man6
infodir = $(prefix)/info
--- config/mh-linux 1998/02/17 00:09:46 1.1
+++ config/mh-linux 1998/02/17 00:10:33
@@ -1,4 +1,5 @@
# X11 libraries are often in a different place.
X11_LIB_FLAGS = -L/usr/X11/lib
+X11_INCLUDE_FLAGS = -I/usr/X11/include
CURSES_LIB = -lncurses
--- lib/Makefile.in 1998/02/17 00:23:56 1.1
+++ lib/Makefile.in 1998/02/17 00:32:39
@@ -21,6 +21,13 @@
gamelibdir = $(datadir)/lib
+GAMEUID = games
+GAMEGRP = bin
+
+GAMEPERM = 04755
+DIRPERM = 0755
+FILEPERM = 0644
+
SHELL = /bin/sh
INSTALL = install -c
@@ -41,7 +48,7 @@
# Build a copy of the library directory at the install place.
-install-only:
+install-only: install-dirs
for i in `ls $(srcdir)/*.dir $(srcdir)/*.g $(srcdir)/*.imf $(srcdir)/news.txt`; do \
echo $$i; \
$(INSTALL_DATA) $(srcdir)/$$i $(gamelibdir); \
@@ -50,6 +57,27 @@
chgrp $(GAMEGRP) $(gamelibdir) $(gamelibdir)/*
chmod $(DIRPERM) $(gamelibdir)
chmod $(FILEPERM) $(gamelibdir)/*
+
+MAKEDIRS = $(gamelibdir)
+
+.PHONY: install-dirs
+install-dirs:
+ @for i in $(MAKEDIRS) ; do \
+ echo Making $$i... ; \
+ parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \
+ if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
+ if [ ! -d $$i ] ; then \
+ if mkdir $$i ; then \
+ true ; \
+ else \
+ exit 1 ; \
+ fi ; \
+ else \
+ true ; \
+ fi ; \
+ done
+
+
clean:
--- x11/Makefile.in 1998/02/17 00:19:40 1.1
+++ x11/Makefile.in 1998/02/17 00:21:56
@@ -182,7 +182,7 @@
install: all install-only
-install-only:
+install-only: install-dirs
srcroot=`cd $(srcroot); pwd`; export srcroot; \
$(INSTALL_PROGRAM) xconq $(bindir); \
chown $(GAMEUID) $(bindir)/xconq; \
@@ -204,6 +204,26 @@
chgrp $(GAMEGRP) $(x11libdir) $(x11libdir)/*
chmod $(DIRPERM) $(x11libdir)
chmod $(FILEPERM) $(x11libdir)/*
+
+MAKEDIRS = $(x11libdir)
+
+.PHONY: install-dirs
+install-dirs:
+ @for i in $(MAKEDIRS) ; do \
+ echo Making $$i... ; \
+ parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \
+ if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
+ if [ ! -d $$i ] ; then \
+ if mkdir $$i ; then \
+ true ; \
+ else \
+ exit 1 ; \
+ fi ; \
+ else \
+ true ; \
+ fi ; \
+ done
+
# Cleanliness support.
- References:
- xc7.1.93
- From: Keir Novik <ken21@cam.ac.uk>