mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-10 06:31:56 +00:00
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.
This commit is contained in:
parent
1dfc12ebf5
commit
2800c2856e
9 changed files with 52 additions and 27 deletions
|
@ -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)
|
||||
|
|
|
@ -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 $<
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -43,7 +43,7 @@ mkdirprog="${MKDIRPROG-mkdir}"
|
|||
|
||||
transformbasename=""
|
||||
transform_arg=""
|
||||
instcmd="$mvprog"
|
||||
instcmd="$cpprog"
|
||||
chmodcmd="$chmodprog 0755"
|
||||
chowncmd=""
|
||||
chgrpcmd=""
|
||||
|
|
|
@ -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@
|
||||
|
||||
|
|
|
@ -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@
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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@
|
||||
|
||||
|
|
Loading…
Reference in a new issue