Major infrastructure changes, part 2.
* Moved helpers, common and triggers dirs into xbps-src, where
they belong.
* Renamed the templates dir to srcpkgs, it was so redundant before.
* Make it possible to add subpkgs with no restriction in names, for
example udev now has a subpkgs called "libgudev". Previously
subpkgs were named "${sourcepkg}-${pkgname}".
* xbps-src: changed to look for template files in current directory.
That means that most arguments from the targets have been removed.
* xbps-src: added a reinstall target, to remove + install.
* xbps-src: do not overwrite binpkgs by default, skip them.
And more that I forgot because it's a mega-commit that I've been
working for some days already...
--HG--
extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
include vars.mk
|
||||
|
||||
BIN = xbps-src
|
||||
SUBDIRS = etc shutils
|
||||
SUBDIRS = etc common helpers triggers shutils
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
@@ -10,14 +10,14 @@ all:
|
||||
-e "s|@@XBPS_INSTALL_SHAREDIR@@|$(SHAREDIR)|g" \
|
||||
$(BIN).sh.in > $(BIN)
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir; \
|
||||
$(MAKE) -C $$dir || exit 1; \
|
||||
done
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
-rm -f $(BIN)
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir clean; \
|
||||
$(MAKE) -C $$dir clean || exit 1; \
|
||||
done
|
||||
|
||||
.PHONY: install
|
||||
@@ -25,12 +25,12 @@ install: all
|
||||
install -d $(SBINDIR)
|
||||
install -m 755 $(BIN) $(SBINDIR)
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir install; \
|
||||
$(MAKE) -C $$dir install || exit 1; \
|
||||
done
|
||||
|
||||
.PHONY: uninstall
|
||||
uninstall:
|
||||
-rm -f $(SBINDIR)/$(BIN)
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir uninstall; \
|
||||
$(MAKE) -C $$dir uninstall || exit 1; \
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user