root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[lib] sub dir move

Browse source
This commit is contained in:
udeved 2015-06-11 22:56:13 +02:00
parent b9b37df2d2
commit 238bf27e38
13 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Makefile
View file

@ -49,16 +49,20 @@ LIBS = \
lib/util.sh \
lib/util-mount.sh \
lib/util-msg.sh \
lib/util-pkg.sh \
lib/util-fstab.sh \
lib/util-iso.sh \
lib/util-iso-fs.sh \
lib/util-iso-image.sh \
lib/util-iso-calamares.sh \
lib/util-livecd.sh \
lib/util-iso-boot.sh \
lib/util-iso-log.sh \
lib/util-pkgtree.sh
lib/util-fstab.sh
LIBS_PKG = \
lib/pkg/util-pkg.sh \
lib/pkg/util-pkgtree.sh
LIBS_ISO = \
lib/iso/util-iso.sh \
lib/iso/util-iso-fs.sh \
lib/iso/util-iso-image.sh \
lib/iso/util-iso-calamares.sh \
lib/iso/util-livecd.sh \
lib/iso/util-iso-boot.sh \
lib/iso/util-iso-log.sh
CPIOHOOKS = \
initcpio/hooks/miso \
@ -122,11 +126,19 @@ install:
install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools
install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-tools
install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-tools/pkg
install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-tools/iso
install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
install -m0644 ${CONFIGFILES} $(DESTDIR)$(PREFIX)/share/manjaro-tools
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)/lib/manjaro-tools
install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/manjaro-tools/pkg
install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/manjaro-tools/iso
install -dm0755 $(DESTDIR)$(PREFIX)/lib/initcpio/hooks
install -m0755 ${CPIOHOOKS} $(DESTDIR)$(PREFIX)/lib/initcpio/hooks
install -dm0755 $(DESTDIR)$(PREFIX)/lib/initcpio/install
@ -135,12 +147,12 @@ install:
install -m0644 ${SCRIPTS} $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts
install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/efi_shell
install -m0644 ${EFISHELL} $(DESTDIR)$(PREFIX)/share/manjaro-tools/efi_shell
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
gzip -c man/buildset.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildset.1.gz
gzip -c man/buildpkg.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildpkg.1.gz
gzip -c man/buildtree.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
gzip -c man/buildiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man5
install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man5
gzip -c man/manjaro-tools.conf.5 > $(DESTDIR)$(PREFIX)/share/man/man5/manjaro-tools.conf.5.gz
gzip -c man/profile.conf.5 > $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
@ -154,7 +166,11 @@ uninstall:
for f in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
for f in ${CONFIGFILES}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
for f in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/pkg/$$f; done
for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/iso/$$f; done
for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/hooks/$$f; done
for f in ${CPIOINST}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/install/$$f; done
for f in ${SCRIPTS}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts/$$f; done

2
bin/buildiso.in
View file

@ -19,7 +19,7 @@ SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-iso.sh
import ${LIBDIR}/iso/util-iso.sh
show_profile(){
cd $1

2
bin/buildpkg.in
View file

@ -20,7 +20,7 @@ SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-pkg.sh
import ${LIBDIR/pkg/util-pkg.sh
show_build_queue(){
if ${is_buildset};then

2
bin/buildtree.in
View file

@ -16,7 +16,7 @@ SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-pkgtree.sh
import ${LIBDIR}/pkg/util-pkgtree.sh
display_settings(){
show_version

0
lib/util-iso-boot.sh → lib/iso/util-iso-boot.sh
View file

0
lib/util-iso-calamares.sh → lib/iso/util-iso-calamares.sh
View file

0
lib/util-iso-fs.sh → lib/iso/util-iso-fs.sh
View file

0
lib/util-iso-image.sh → lib/iso/util-iso-image.sh
View file

0
lib/util-iso-log.sh → lib/iso/util-iso-log.sh
View file

8
lib/util-iso.sh → lib/iso/util-iso.sh
View file

@ -9,10 +9,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
import ${LIBDIR}/util-iso-image.sh
import ${LIBDIR}/util-iso-boot.sh
import ${LIBDIR}/util-iso-calamares.sh
import ${LIBDIR}/util-iso-fs.sh
import ${LIBDIR}/iso/util-iso-image.sh
import ${LIBDIR}/iso/util-iso-boot.sh
import ${LIBDIR}/iso/util-iso-calamares.sh
import ${LIBDIR}/iso/util-iso-fs.sh
# $1: path
# $2: exit code

0
lib/util-livecd.sh → lib/iso/util-livecd.sh
View file

0
lib/util-pkg.sh → lib/pkg/util-pkg.sh
View file

0
lib/util-pkgtree.sh → lib/pkg/util-pkgtree.sh
View file