Changeset 4245

Timestamp:

06/08/06 19:32:30 (2 years ago)

Author:

morris

Message:

Allow makefiles to build in user-specified directories (for building from Xcode)

Files:

• wired/trunk/Makefile.in (modified) (5 diffs)
• wired/trunk/configure (modified) (6 diffs)
• wired/trunk/configure.in (modified) (3 diffs)

wired/trunk/Makefile.in

@@ -5 +5 @@
-fake_prefix             = @fake_prefix@
-installdir              = $(prefix)/$(wireddir)
-obj
-run
+@objdir@
+@rundir@
-mandir                  = @mandir@
-prefix                  = @prefix@
@@ -40 +40 @@
-CFLAGS                  = @CFLAGS@
-CPPFLAGS                = @CPPFLAGS@
-top_srcdir)/libwired/run
+rundir)/libwired
-LIBS                    = -lwired @LIBS@
-libwired/run
+$(rundir)/libwired
-
-INSTALL                 = @INSTALL@
@@ -77 +77 @@
-endif
-
-libwired/run
+$(rundir)/libwired
-        $(LINK) $(HL2WIREDOBJECTS) $(LIBS)
-
-libwired/run
+$(rundir)/libwired
-        $(LINK) $(WIREDOBJECTS) $(LIBS)
-
-
+$(top_srcdir)/
-        sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' $< > $@
-        chmod +x $@
-
-
+$(top_srcdir)/
-        sed -e 's,@WD_USER\@,$(WD_USER),g' -e 's,@WD_GROUP\@,$(WD_GROUP),g' $< > $@
-
-
+$(top_srcdir)/
-        @test -d $(@D) || mkdir -p $(@D)
-        $(COMPILE) -I$(<D) -c $< -o $@
-
-
+$(top_srcdir)/
-        @test -d $(@D) || mkdir -p $(@D)
-        $(COMPILE) -I$(<D) -c $< -o $@
-
-
+$(top_srcdir)/
-        @test -d $(@D) || mkdir -p $(@D)
-        ($(DEPEND) $< | sed 's,$*.o,$(@D)/&,g'; echo "$@: $<") > $@
@@ -119 +119 @@
-                $(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/files/Uploads/; \
-                $(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/files/Uploads/.wired/; \
-run
+$(rundir)
-                $(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/files/Drop\ Box/; \
-                $(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/files/Drop\ Box/.wired/; \
-run
+$(rundir)
-        fi
-
-        if [ ! -f $(installdir)/banlist ]; then \
-run
+$(rundir)
-        fi
-
-        if [ ! -f $(installdir)/groups ]; then \
-run
+$(rundir)
-        fi
-
-        if [ ! -f $(installdir)/news ]; then \
-run
+$(rundir)
-        fi
-
-        if [ ! -f $(installdir)/users ]; then \
-run
+$(rundir)
-        fi
-
-        if [ ! -f $(installdir)/etc/wired.conf ]; then \
-run
-
-
-run
-run
-run
+$(rundir)
+
+
+$(rundir)
+$(rundir)
+$(rundir)
-
-        if [ -f /etc/resolv.conf ]; then \
@@ -177 +177 @@
-install-man:
-        $(INSTALL) -m 755 -d $(mandir)/man1/
-
-
+$(top_srcdir)/
+$(top_srcdir)/
-        $(INSTALL) -m 755 -d $(mandir)/man5/
-
+$(top_srcdir)/
-        $(INSTALL) -m 755 -d $(mandir)/man8/
-
+$(top_srcdir)/
-
-dist:

wired/trunk/configure

@@ -313 +313 @@
-
-ac_subdirs_all="$ac_subdirs_all libwired"
-fake_prefix wired
+wireddir fake_prefix objdir run
-ac_subst_files=''
-
@@ -860 +860 @@
-  --with-user=USER        install files as USER [wired]
-  --with-group=GROUP      install files as GROUP [daemon]
-  --with-fake-prefix=FPREFIX
-                          install in FPREFIX but look like PREFIX [PREFIX]
-  --with-wireddir=DIR     install server components in PREFIX/DIR [wired]
+
-
-Some influential environment variables:
@@ -2995 +2994 @@
-
-
+# Check for wired directory name
+
+# Check whether --with-wireddir or --without-wireddir was given.
+if test "${with_wireddir+set}" = set; then
+  withval="$with_wireddir"
+
+fi;
+
+if test -n "$with_wireddir"; then
+        wd_wireddir="$with_wireddir"
+        wireddir="$with_wireddir"
+
+else
+        wd_wireddir="wired"
+        wireddir='wired'
+
+fi
+
+
-# Check for fake prefix
-
@@ -3012 +3030 @@
-
-
-wired
-
-wireddir or --without-wired
-wired
-wired
+object
+
+objdir or --without-obj
+obj
+obj
-
-fi;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
@@ -5920 +5957 @@
-
-# Configure libwired
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-subdirs="$subdirs libwired"
-
+fi
-
-cat >confcache <<\_ACEOF
@@ -6559 +6613 @@
-s,@WD_USER@,$WD_USER,;t t
-s,@WD_GROUP@,$WD_GROUP,;t t
+s,@wireddir@,$wireddir,;t t
-s,@fake_prefix@,$fake_prefix,;t t
-
+
+
-s,@WD_MAINTAINER@,$WD_MAINTAINER,;t t
-s,@CPP@,$CPP,;t t

wired/trunk/configure.in

@@ -129 +129 @@
-
-
-# Check for fake prefix
-AC_ARG_WITH([fake_prefix], AC_HELP_STRING([--with-fake-prefix=FPREFIX], [install in FPREFIX but look like PREFIX [[PREFIX]]]))
-
-if test -n "$with_fake_prefix"; then
-        AC_SUBST([fake_prefix], ["$with_fake_prefix"])
-else
-        AC_SUBST([fake_prefix], ['${prefix}'])
-fi
-
-
-# Check for wired directory name
-AC_ARG_WITH([wireddir], AC_HELP_STRING([--with-wireddir=DIR], [install server components in PREFIX/DIR [[wired]]]))
@@ -148 +138 @@
-        wd_wireddir="wired"
-        AC_SUBST([wireddir], ['wired'])
+fi
+
+
+# Check for fake prefix
+AC_ARG_WITH([fake_prefix])
+
+if test -n "$with_fake_prefix"; then
+        AC_SUBST([fake_prefix], ["$with_fake_prefix"])
+else
+        AC_SUBST([fake_prefix], ['${prefix}'])
+fi
+
+
+# Check for object directory name
+AC_ARG_WITH([objdir])
+
+if test -n "$with_objdir"; then
+        AC_SUBST([objdir], ["$with_objdir"])
+        wd_libwired_objdir="$with_objdir"
+else
+        AC_SUBST([objdir], ["obj"])
+        wd_libwired_objdir="$(pwd)/obj"
+fi
+
+
+# Check for run directory name
+AC_ARG_WITH([rundir])
+
+if test -n "$with_rundir"; then
+        AC_SUBST([rundir], ["$with_rundir"])
+        wd_libwired_rundir="$with_rundir/libwired"
+else
+        AC_SUBST([rundir], ["run"])
+        wd_libwired_rundir="$(pwd)/run/libwired"
-fi
-
@@ -362 +386 @@
-
-# Configure libwired
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-AC_OUTPUT