From 2800c2856eb3e5f86086e66738c3b8f1590d3d41 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 13 Mar 2000 11:54:24 +0000 Subject: [PATCH] make install now works (caused by a flakey install-sh), as does build_rpm. Also, there was a bug in configure.in that caused glx not to be built at all on my system. NOTE: I changed SRC_DIR to srcdir (GNU `standard'), though I'm beginning to wonder if that was so good. --- Makefile.in | 8 ++++---- Rules.mk.in | 6 +++--- configure.in | 2 +- install-sh | 2 +- qw_client/Makefile.in | 12 ++++++++++-- qw_server/Makefile.in | 12 ++++++++++-- rpm/build_rpm.in | 1 + rpm/quakeforge.spec.in | 24 ++++++++++++------------ uquake/Makefile.in | 12 ++++++++++-- 9 files changed, 52 insertions(+), 27 deletions(-) diff --git a/Makefile.in b/Makefile.in index 69a618f..bc895df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -SRC_DIR = @srcdir@ +srcdir = @srcdir@ HAVE_UDP = @HAVE_UDP@ ifeq ($(HAVE_UDP),yes) @@ -43,12 +43,12 @@ changelog: # Code to automatically re-configure, only runs if you are compiling in the # source directory -ifeq ($(SRC_DIR),.) +ifeq ($(srcdir),.) configure: configure.in acconfig.h ./bootstrap -CONFIG_SRC = Makefile.in qw_client/Makefile.in qw_server/Makefile.in \ - uquake/Makefile.in common/Makefile.in \ +CONFIG_SRC = Makefile.in Rules.mk.in qw_client/Makefile.in \ + qw_server/Makefile.in uquake/Makefile.in common/Makefile.in \ rpm/build_rpm.in rpm/quakeforge.spec.in $(patsubst %.in,%,$(CONFIG_SRC)): configure $(CONFIG_SRC) diff --git a/Rules.mk.in b/Rules.mk.in index bcf3865..934928d 100644 --- a/Rules.mk.in +++ b/Rules.mk.in @@ -12,7 +12,7 @@ CC := @CC@ LDFLAGS += @LDFLAGS@ @LIBS@ -INCLUDES += -I$(SRC_DIR) -I$(COMMON_DIR) @OGL_INCLUDES@ -I$(top_builddir)/common +INCLUDES += -I$(srcdir) -I$(COMMON_DIR) @OGL_INCLUDES@ -I$(top_builddir)/common CFLAGS += @CFLAGS@ $(INCLUDES) MAKE_SURE_DIR = if test -d "$$DIR"; then \ @@ -52,11 +52,11 @@ endif # Compilation rules # -$(OBJ_PATTERN): $(SRC_DIR)/%.c +$(OBJ_PATTERN): $(srcdir)/%.c @DIR=$(@D); $(MAKE_SURE_DIR) $(CC) $(CFLAGS) -o $@ -c $< -$(OBJ_PATTERN): $(SRC_DIR)/%.s +$(OBJ_PATTERN): $(srcdir)/%.s @DIR=$(@D); $(MAKE_SURE_DIR) $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $< diff --git a/configure.in b/configure.in index 680d2ca..340bf94 100644 --- a/configure.in +++ b/configure.in @@ -309,7 +309,7 @@ if test "x$HAS_OGL" != xno; then OGL_INCLUDES="-I${x_includes:-.}" fi save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $OGL_CFLAGS" + CPPFLAGS="$CPPFLAGS $OGL_INCLUDES" AC_CHECK_HEADER(GL/gl.h, HAS_OGL=yes, HAS_OGL=no) if test "x$HAS_OGL" != xno; then AC_CHECK_HEADER(GL/xmesa.h, HAS_XMESA=yes, HAS_XMESA=no) diff --git a/install-sh b/install-sh index e9de238..c1666c3 100755 --- a/install-sh +++ b/install-sh @@ -43,7 +43,7 @@ mkdirprog="${MKDIRPROG-mkdir}" transformbasename="" transform_arg="" -instcmd="$mvprog" +instcmd="$cpprog" chmodcmd="$chmodprog 0755" chowncmd="" chgrpcmd="" diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in index dd6a248..6bd2fc9 100644 --- a/qw_client/Makefile.in +++ b/qw_client/Makefile.in @@ -3,10 +3,18 @@ # Quake general stuff # +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +datadir = @datadir@ + top_builddir = .. -PROJECT_DIR := @top_srcdir@ +PROJECT_DIR := ${top_srcdir} BIN_PREFIX := qw-client -SRC_DIR := @srcdir@ MODULE := qw_client OBJ_PATTERN = $(BUILD_DIR)/common_lib/%.@OBJEXT@ $(BUILD_DIR)/%.@OBJEXT@ diff --git a/qw_server/Makefile.in b/qw_server/Makefile.in index dc00dee..8c92565 100644 --- a/qw_server/Makefile.in +++ b/qw_server/Makefile.in @@ -3,10 +3,18 @@ # Quake general stuff # +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +datadir = @datadir@ + top_builddir = .. -PROJECT_DIR := @top_srcdir@ +PROJECT_DIR := ${top_srcdir} BIN_PREFIX := qw-server -SRC_DIR := @srcdir@ MODULE := qw_server OBJ_PATTERN = $(BUILD_DIR)/%.@OBJEXT@ diff --git a/rpm/build_rpm.in b/rpm/build_rpm.in index 38fd59c..4a69827 100755 --- a/rpm/build_rpm.in +++ b/rpm/build_rpm.in @@ -7,6 +7,7 @@ if [ "$srcdir" = "." ]; then srcdir=.. fi +rm -rf BUILD SPECS RPMS SOURCES SRPMS mkdir -p BUILD SPECS RPMS/{noarch,i386,i686} SOURCES SRPMS rm -rf ${temp_dir}/quakeforge-${version} cp -a $srcdir ${temp_dir}/quakeforge-${version} diff --git a/rpm/quakeforge.spec.in b/rpm/quakeforge.spec.in index 9f783cd..c1f84a6 100644 --- a/rpm/quakeforge.spec.in +++ b/rpm/quakeforge.spec.in @@ -35,12 +35,12 @@ Requires: quakeforge %description server %if "%{HAS_OGL}"=="'yes'" -%package gl +%package glx Summary: OpenGL(tm) support Group: Amusements/Games Requires: quakeforge -%description gl +%description glx %endif %if "%{HAS_TDFXGL}"=="'yes'" @@ -128,49 +128,49 @@ make DESTDIR="$RPM_BUILD_ROOT" install /usr/bin/qw-server %if "%{HAS_OGL}"=="'yes'" -%files gl -/usr/bin/quake-gl -/usr/bin/qw-client-gl +%files glx +/usr/bin/uquake-glx +/usr/bin/qw-client-glx %endif %if "%{HAS_TDFXGL}"=="'yes'" %files 3dfx -/usr/bin/quake-3dfx +/usr/bin/uquake-3dfx /usr/bin/qw-client-3dfx %endif %if "%{HAS_X11}"=="'yes'" %files x11 -/usr/bin/quake-x11 +/usr/bin/uquake-x11 /usr/bin/qw-client-x11 %endif %if "%{HAS_SVGA}"=="'yes'" %files svga -/usr/bin/quake-svga +/usr/bin/uquake-svga /usr/bin/qw-client-svga %endif %if "%{HAS_VGA}"=="'yes'" %files vga -/usr/bin/quake-vga +/usr/bin/uquake-vga /usr/bin/qw-client-vga %endif %if "%{HAS_MGL}"=="'yes'" %files gml -/usr/bin/quake-mgl +/usr/bin/uquake-mgl /usr/bin/qw-client-mgl %endif %if "%{HAS_GGI}"=="'yes'" %files ggi -/usr/bin/quake-ggi +/usr/bin/uquake-ggi /usr/bin/qw-client-ggi %endif %if "%{HAS_SDL}"=="'yes'" %files sdl -/usr/bin/quake-sdl +/usr/bin/uquake-sdl /usr/bin/qw-client-sdl %endif diff --git a/uquake/Makefile.in b/uquake/Makefile.in index db1582a..d80d40a 100644 --- a/uquake/Makefile.in +++ b/uquake/Makefile.in @@ -3,10 +3,18 @@ # Quake general stuff # +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +datadir = @datadir@ + top_builddir = .. -PROJECT_DIR := @top_srcdir@ +PROJECT_DIR := ${top_srcdir} BIN_PREFIX := uquake -SRC_DIR := @srcdir@ MODULE := uquake OBJ_PATTERN = $(BUILD_DIR)/common_lib/%.@OBJEXT@ $(BUILD_DIR)/%.@OBJEXT@