fix generating package tables

manuals/en/main/Makefile

@@ -35,7 +35,6 @@ GENERATED = autogenerated/bareos-dir-*.tex \
 	autogenerated/bareos-tray-monitor-*.tex \
 	autogenerated/bareos-15.2-packages-table-*.tex
 
-
 LOG = bareos-manual-main-reference.log
 
 all: pdf html
@@ -141,9 +140,8 @@ autogenerated/bareos-tray-monitor-*.tex: autogenerated/bareos-tray-monitor-confi
 	# generates all tray-monitor resource files
 	$(GENERATED_RESOURCE_DESCRIPTIONS) autogenerated/bareos-tray-monitor-config-schema.json
 
-autogenerated/bareos-15.2-packages-table-*.tex: autogenerated/bareos-15.2-packages.json
-	$(GENERATED_PACKAGE_INFO) autogenerated/bareos-15.2-packages.json
-
+autogenerated/bareos-15.2-packages-table-*.tex:
+	$(GENERATED_PACKAGE_INFO) -o autogenerated/ data/bareos-15.2-packages.json
 
 check: bareos-manual-main-reference.pdf
 	@# hyperlink: multiline: pdfTeX warning .* has been reference$d but does not exist

manuals/scripts/generate-bareos-package-info.py

@@ -140,6 +140,7 @@ def generate_overview_table(data, dist_include):
     parser = argparse.ArgumentParser(description='Generate information about packages in distributions.')
 
     parser.add_argument('--debug', '-d', action='store_true', help="enable debugging output")
+    parser.add_argument('--out', '-o', help="output directory", default=".")    
     parser.add_argument('filename', help="JSON file containing package information")
 
     args = parser.parse_args()
@@ -151,15 +152,17 @@ def generate_overview_table(data, dist_include):
         json_data = json.load(json_file)
     #print(json_data)
 
-    filename = args.filename.replace('.json','-table-redhat.tex')
+    basename = os.path.basename(args.filename)
+    dest = args.out + '/' + basename
+    filename = dest.replace('.json','-table-redhat.tex')
     with open(filename, "w") as file:
         file.write(generate_overview_table(json_data, re.compile('CentOS.*|RHEL.*|Fedora.*')))
         file.close()
-    filename = args.filename.replace('.json','-table-suse.tex')
+    filename = dest.replace('.json','-table-suse.tex')
     with open(filename, "w") as file:
         file.write(generate_overview_table(json_data, re.compile('openSUSE.*|SLE.*')))
         file.close()
-    filename = args.filename.replace('.json','-table-debian.tex')
+    filename = dest.replace('.json','-table-debian.tex')
     with open(filename, "w") as file:
         file.write(generate_overview_table(json_data, re.compile('Debian.*|xUbuntu.*|Univention.*')))
         file.close()