Merge branch 'feature/use-autoconf-automake-shpp-and-shld'

2 files changed, 16 insertions, 19 deletions

diff --git a/locale/en_US/pro_archman.sh b/locale/en_US.sh
index 76c5e58..920df73 100644
--- a/locale/en_US/pro_archman.sh
+++ b/locale/en_US.sh
@@ -27,18 +27,18 @@ msg_pro_archman_opt_v_summary='print verbose informational messages'
 msg_pro_archman_opt_b_summary='set archive base directory to <base-dir>'
 msg_pro_archman_opt_b_arg='<base-dir>'
 
-# lib/cmd.sh
+# src/cmd.sh
 msg_pro_archman_cmd_not_found='Command "%s" not found'
 msg_pro_archman_cmd_usage='Usage: %s [<option> ...] %s %s'
 
-# lib/cmd/help.sh
+# src/cmd/help.sh
 msg_pro_archman_cmd_help_head='Usage: %s [<option> ...] <command> [<arg> ...]'
 msg_pro_archman_cmd_help_opts_head='Options:'
 msg_pro_archman_cmd_help_summary_head='Commands:'
 msg_pro_archman_cmd_help_summary='print this help message'
 msg_pro_archman_cmd_help_usage='[<command>]'
 
-# lib/cmd/version.sh
+# src/cmd/version.sh
 msg_pro_archman_cmd_version_summary='print version information'
 msg_pro_archman_cmd_version_usage=''
 msg_pro_archman_cmd_version_copyright='Copyright (C) %s %s
@@ -46,42 +46,42 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.'
 
-# lib/cmd/include.sh
+# src/cmd/include.sh
 msg_pro_archman_cmd_include_summary='include packages described in changes files'
 msg_pro_archman_cmd_include_usage='<changes> ...'
 
-# lib/include.sh
+# src/include.sh
 msg_pro_archman_include_unknown_changes_format='%s: Unknown format "%s"'
 msg_pro_archman_include_including='Including %s (%s) into %s/%s...'
 msg_pro_archman_include_no_files='No package files to include'
 msg_pro_archman_include_bvap_exists='Packages already exist for binary version %s, architecture %s, and platform %s'
 
-# lib/cmd/process-incoming.sh
+# src/cmd/process-incoming.sh
 msg_pro_archman_cmd_process_incoming_summary='include packages in incoming'
 msg_pro_archman_cmd_process_incoming_usage=''
 msg_pro_archman_cmd_process_incoming_processing='Processing changes in incoming...'
 
-# lib/cmd/remove.sh
+# src/cmd/remove.sh
 msg_pro_archman_cmd_remove_summary='remove packages from a suite'
 msg_pro_archman_cmd_remove_usage='<suite> <source>'
 
-# lib/remove.sh
+# src/remove.sh
 msg_pro_archman_removing_from_suite='Removing package %s from suite %s/%s...'
 msg_pro_archman_removing_from_suite_archplat='Removing package %s from suite %s/%s, architecture %s, and platform %s...'
 
-# lib/cmd/copy-suite.sh
+# src/cmd/copy-suite.sh
 msg_pro_archman_cmd_copy_suite_summary='copy packages from one suite to another'
 msg_pro_archman_cmd_copy_suite_usage='<source-suite> <destination-suite>'
 
-# lib/cmd/remove-suite.sh
+# src/cmd/remove-suite.sh
 msg_pro_archman_cmd_remove_suite_summary='remove a suite'
 msg_pro_archman_cmd_remove_suite_usage='<suite>'
 
-# lib/suite.sh
+# src/suite.sh
 msg_pro_archman_suite_copying='Copying suite %s/%s to suite %s/%s...'
 msg_pro_archman_suite_removing='Removing suite %s/%s...'
 
-# lib/control.sh
+# src/control.sh
 msg_pro_archman_control_empty_line='empty line'
 msg_pro_archman_control_bad_nv='badly formatted control field'
 msg_pro_archman_control_unknown_field='unrecognized field "%s"'
@@ -90,13 +90,13 @@ msg_pro_archman_control_found_contination='found continuation line where expecte
 msg_pro_archman_list_item_separator=', '
 msg_pro_archman_control_missing_fields='missing fields: %s'
 
-# lib/index.sh
+# src/index.sh
 msg_pro_archman_feed_adding='Adding package %s to feed %s/%s/%s/%s/%s...'
 msg_pro_archman_feed_removing='Removing package %s from feed %s/%s/%s/%s/%s...'
 msg_pro_archman_updating_feeds='Updating feeds...'
 msg_pro_archman_updating_feed='Updating feed %s/%s/%s/%s/%s...'
 
-# lib/garbage.sh
+# src/garbage.sh
 msg_pro_archman_collecting_garbage='Collecting garbage...'
 msg_pro_archman_collecting_garbage_file='Deleting file %s...'
 msg_pro_archman_marking_garbage_file='Marking file %s for future deletion...'
diff --git a/locale/local.mk b/locale/local.mk
index 73a831e..483c6af 100644
--- a/locale/local.mk
+++ b/locale/local.mk
@@ -1,5 +1,2 @@
-# pro-archman
-# locale/local.mk
-
-locale_srcs = \
-	locale/en_US/pro_archman.sh
+locale_sources = \
+	%reldir%/en_US.sh