Skip to content
Permalink
Browse files

Submitted by: jmpp@

Lets assure all our Makefiles respect a temporary ${DESTDIR} installation.
Also some minor cleanups here and there.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@14467 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
jmpalacios committed Oct 8, 2005
1 parent 715c949 commit 4f1e624dd01dafa5bb8b9319607f9a0fb0f54ec2
@@ -15,7 +15,7 @@ Mk/dports.autoconf.mk src/pextlib1.0/config.h: configure
all:: Mk/dports.autoconf.mk

install::
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 dp_version ${portconfigdir}
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 dp_version ${DESTDIR}${portconfigdir}
@echo ""
@echo "Congratulations, you have successfully installed the DarwinPorts system."
@echo ""
@@ -14,7 +14,7 @@ CFLAGS_LIBCURL = @CFLAGS_LIBCURL@

TCL_CC = @TCL_CC@
SHLIB_LD = @SHLIB_LD@
LDFLAGS_LIBCURL = @LDFLAGS_LIBCURL@
LDFLAGS_LIBCURL = @LDFLAGS_LIBCURL@
LDFLAGS = @LDFLAGS@ $(LDFLAGS_LIBCURL)
SHLIB_LDFLAGS = @LDFLAGS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
@@ -23,7 +23,7 @@ install::
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
done

echo "${TCL_PACKAGE_DIR}" > ${prefix}/var/db/dports/.tclpackage
echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/db/dports/.tclpackage

$(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
# XXX Prior installations of dports on Darwin installed darwinports1.0
@@ -14,8 +14,6 @@ distclean::
test::

install::
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports/Tcl
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
@@ -19,8 +19,6 @@ distclean::
rm -f port_autoconf.tcl

install::
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports/Tcl
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
@@ -6,7 +6,6 @@ include ../../../Mk/dports.subdir.mk
include ../../../Mk/dports.autoconf.mk

install::
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports/resources
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
# $(SILENT)set -x; for file in ${RSRCS}; do \
# $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
@@ -12,22 +12,22 @@ all: portregister.cgi portsubmit.cgi initialize.sql register.html
@ cat $< | sed "/@@PREFIX@@/s//$(subst /,\/,$(PREFIX))/" > $@

install: all
mkdir -p $(PREFIX)
chown www:www $(PREFIX)
chmod 0775 $(PREFIX)
$(INSTALL) -m 644 register.html $(PREFIX)
mkdir -p $(cgibin)
chown www:www $(cgibin)
chmod 0775 $(cgibin)
$(INSTALL) -m 755 portsubmit.cgi $(cgibin)
$(INSTALL) -m 755 portregister.cgi $(cgibin)
mkdir -p $(portindex)
chown www:www $(portindex)
chmod 0775 $(portindex)
mkdir -p $(portfiles)
chown www:www $(portfiles)
chmod 0775 $(portfiles)
$(INSTALL) -m 644 initialize.sql $(portindex)
mkdir -p ${DESTDIR}$(PREFIX)
chown www:www ${DESTDIR}$(PREFIX)
chmod 0775 ${DESTDIR}$(PREFIX)
$(INSTALL) -m 644 register.html ${DESTDIR}$(PREFIX)
mkdir -p ${DESTDIR}$(cgibin)
chown www:www ${DESTDIR}$(cgibin)
chmod 0775 ${DESTDIR}$(cgibin)
$(INSTALL) -m 755 portsubmit.cgi ${DESTDIR}$(cgibin)
$(INSTALL) -m 755 portregister.cgi ${DESTDIR}$(cgibin)
mkdir -p ${DESTDIR}$(portindex)
chown www:www ${DESTDIR}$(portindex)
chmod 0775 ${DESTDIR}$(portindex)
mkdir -p ${DESTDIR}$(portfiles)
chown www:www ${DESTDIR}$(portfiles)
chmod 0775 ${DESTDIR}$(portfiles)
$(INSTALL) -m 644 initialize.sql ${DESTDIR}$(portindex)

clean:
rm -f *.cgi
@@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.5 2005/08/25 13:27:35 pguyot Exp $
# $Id: Makefile.in,v 1.6 2005/10/08 02:20:40 jmpp Exp $

top_srcdir = @top_srcdir@

@@ -21,7 +21,7 @@ daemondo: mkdirs ${PROGRAM}

${PROGRAM}: ${OBJS}
${CC} ${CFLAGS} -o ${PROGRAM} ${LIBS} ${OBJS}

mkdirs:
mkdir -p build

@@ -32,6 +32,6 @@ distclean: clean
rm -f Makefile

install:
${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${bindir}
${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${DESTDIR}${bindir}

test:
@@ -60,6 +60,6 @@ distclean: clean
rm -f Makefile config.h config.status config.log

install:
${INSTALL} ${PROG} ${bindir}
${INSTALL} -m 755 -d ${mandircat8}
${INSTALL} -m 444 ${PROG}.cat8 ${mandircat8}/${PROG}.0
${INSTALL} ${PROG} ${DESTDIR}${bindir}
${INSTALL} -m 755 -d ${DESTDIR}${mandircat8}
${INSTALL} -m 444 ${PROG}.cat8 ${DESTDIR}${mandircat8}/${PROG}.0

0 comments on commit 4f1e624

Please sign in to comment.
You can’t perform that action at this time.