snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps-src: set ETCDIR to PREFIX/etc/xbps by default.

This commit is contained in:
Juan RP 2011-11-18 16:06:11 +01:00
parent 2e53ec2c82
commit 47a52ce84f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xbps-src/etc/Makefile
View File

@ -26,7 +26,7 @@ install:
fi fi
if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then \ if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then \
install -m 644 $(CONF_FILE) $(DESTDIR)$(ETCDIR); \ install -m644 $(CONF_FILE) $(DESTDIR)$(ETCDIR); \
fi fi
.PHONY: uninstall .PHONY: uninstall

4
xbps-src/shutils/chroot.sh
View File

@ -66,7 +66,7 @@ chroot_init()
mkdir -p $XBPS_MASTERDIR/usr/local/etc mkdir -p $XBPS_MASTERDIR/usr/local/etc
fi fi
XBPSSRC_CF=$XBPS_MASTERDIR/usr/local/etc/xbps-src.conf XBPSSRC_CF=$XBPS_MASTERDIR/usr/local/etc/xbps/xbps-src.conf
cat > $XBPSSRC_CF <<_EOF cat > $XBPSSRC_CF <<_EOF
# Generated configuration file by xbps-src, DO NOT EDIT! # Generated configuration file by xbps-src, DO NOT EDIT!
@ -107,7 +107,7 @@ _EOF
cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF
#!/bin/sh #!/bin/sh
. /usr/local/etc/xbps-src.conf . /usr/local/etc/xbps/xbps-src.conf
. /usr/local/share/xbps-src/shutils/init_funcs.sh . /usr/local/share/xbps-src/shutils/init_funcs.sh
set_defvars set_defvars

2
xbps-src/vars.mk
View File

@ -7,4 +7,4 @@ SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin
# #
SHAREDIR ?= $(PREFIX)/share/xbps-src SHAREDIR ?= $(PREFIX)/share/xbps-src
LIBEXECDIR ?= $(PREFIX)/libexec/xbps-src LIBEXECDIR ?= $(PREFIX)/libexec/xbps-src
ETCDIR ?= $(PREFIX)/etc ETCDIR ?= $(PREFIX)/etc/xbps

2
xbps-src/xbps-src.sh.in
View File

@ -23,7 +23,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#- #-
readonly XBPS_SRC_BUILD_VERSION=20111118 readonly XBPS_SRC_BUILD_VERSION=20111118-1
if [ -n "$IN_CHROOT" ]; then if [ -n "$IN_CHROOT" ]; then
export XBPS_ETCDIR=/usr/local/etc/xbps export XBPS_ETCDIR=/usr/local/etc/xbps