projects / packages / util-vserver.git / blame
| Commit | Line | Data |
|---|---|---|
| f6c359be JR |
1 | --- util-vserver-0.30.216-pre3002/src/Makefile-files.orig 2012-01-31 23:25:27.728011969 +0100 |
| 2 | +++ util-vserver-0.30.216-pre3002/src/Makefile-files 2012-01-31 23:25:42.681286983 +0100 | |
| 3 | @@ -105,7 +105,7 @@ | |
| 4 | src/context-sync.hc \ | |
| 5 | src/attribute-util.h | |
| 6 | ||
| 7 | -pkglib_PROGRAMS += src/capchroot \ | |
| 8 | +pkgbin_PROGRAMS += src/capchroot \ | |
| 9 | src/chain-echo \ | |
| 10 | src/chcontext-compat \ | |
| 11 | src/check-unixfile \ | |
| 12 | @@ -132,7 +132,7 @@ | |
| 13 | ||
| 14 | if ENSC_HAVE_C99_COMPILER | |
| 15 | if ENSC_HAVE_CRYPTO | |
| 16 | -pkglib_PROGRAMS += src/vhashify | |
| 17 | +pkgbin_PROGRAMS += src/vhashify | |
| 18 | endif ENSC_HAVE_CRYPTO | |
| 19 | endif ENSC_HAVE_C99_COMPILER | |
| 20 | ||
| 21 | --- util-vserver-0.30.216-pre3002/scripts/Makefile-files.orig 2012-01-31 23:24:11.208310397 +0100 | |
| 22 | +++ util-vserver-0.30.216-pre3002/scripts/Makefile-files 2012-01-31 23:24:36.028213599 +0100 | |
| 23 | @@ -121,9 +121,9 @@ | |
| 24 | sbin_SCRIPTS += $(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) \ | |
| 25 | $(scripts_legacy_src_PRGS) | |
| 26 | scripts_sbincfg_DTA = $(scripts_sbincfg_gen_DTA) | |
| 27 | -pkglib_SCRIPTS += $(scripts_pkglib_src_SCRPTS) | |
| 28 | +pkgdata_SCRIPTS += $(scripts_pkglib_src_SCRPTS) | |
| 29 | legacy_SCRIPTS += $(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS) | |
| 30 | -pkglib_DATA += $(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA) | |
| 31 | +pkgdata_DATA += $(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA) | |
| 32 | ||
| 33 | CLEANFILES += $(scripts_pkglib_gen_DTA) \ | |
| 34 | $(scripts_sbin_gen_PRGS) \ | |
| 35 | --- util-vserver-0.30.216-pre3002/Makefile.am.orig 2011-11-25 21:27:42.000000000 +0100 | |
| 36 | +++ util-vserver-0.30.216-pre3002/Makefile.am 2012-01-31 23:23:24.445159440 +0100 | |
| 37 | @@ -34,9 +34,11 @@ | |
| 38 | lib_LTLIBRARIES = | |
| 39 | pkglib_LTLIBRARIES = | |
| 40 | ||
| 41 | -pkglib_SCRIPTS = | |
| 42 | -pkglib_DATA = FEATURES.txt | |
| 43 | -pkglib_PROGRAMS = | |
| 44 | +pkgdatadir = $(pkglibdir) | |
| 45 | +pkgbindir = $(pkglibdir) | |
| 46 | +pkgdata_SCRIPTS = | |
| 47 | +pkgdata_DATA = FEATURES.txt | |
| 48 | +pkgbin_PROGRAMS = | |
| 49 | legacy_SCRIPTS = | |
| 50 | legacy_PROGRAMS = | |
| 51 | ||
| 52 | @@ -167,7 +168,7 @@ | |
| 53 | vserverpkgdir = $(vserverdir)/.pkg | |
| 54 | vshelperstatedir = $(localstatedir)/run/vshelper | |
| 55 | ||
| 56 | -fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ | |
| 57 | +fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkgdata_SCRIPTS))) \ | |
| 58 | $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \ | |
| 59 | $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) \ | |
| 60 | $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS))) | |
| 61 | --- util-vserver-0.30.216-pre3002/gentoo/Makefile-files~ 2011-11-25 21:27:42.000000000 +0100 | |
| 62 | +++ util-vserver-0.30.216-pre3002/gentoo/Makefile-files 2012-01-31 23:32:46.972965573 +0100 | |
| 63 | @@ -29,5 +29,5 @@ | |
| 64 | ||
| 65 | if HAVE_GENTOO_INIT | |
| 66 | initrd_SCRIPTS += $(gentoo_src_SCRPTS) | |
| 67 | -pkglib_SCRIPTS += gentoo/bash-wrapper | |
| 68 | +pkgdata_SCRIPTS += gentoo/bash-wrapper | |
| 69 | endif |