handle optional files in Makefile.vars

Author: eserte

data/Makefile.vars

@@ -1,6 +1,9 @@
 # DO NOT EDIT, CHANGE THE VARIABLES in doit.pl and re-run doit.pl!
 
-ADDITIONAL_SOURCEID_FILES=	routing_helper-orig /home/e/eserte/src/bbbike-aux/bbd/fragezeichen_lowprio.bbd
+ADDITIONAL_SOURCEID_FILES=	routing_helper-orig
+.if exists($(BBBIKEAUXDIR)/bbd/fragezeichen_lowprio.bbd)
+ADDITIONAL_SOURCEID_FILES+=	$(BBBIKEAUXDIR)/bbd/fragezeichen_lowprio.bbd
+.endif
 
 SOURCE_TARGETS_SOURCES=	strassen-orig plaetze-orig landstrassen-orig landstrassen2-orig strassen_bab-orig flaechen-orig wasserstrassen-orig wasserumland-orig wasserumland2-orig sbahn-orig sbahnhof-orig rbahn-orig rbahnhof-orig ubahn-orig ubahnhof-orig faehren-orig hoehe-orig orte-orig orte2-orig orte_city-orig ortsschilder-orig ampeln-orig ampelschaltung-orig plz-orig potsdam-orig deutschland-orig grenzuebergaenge-orig sehenswuerdigkeit-orig obst-orig radwege-orig qualitaet_s-orig qualitaet_l-orig handicap_s-orig handicap_l-orig handicap_directed-orig vorfahrt-orig nolighting-orig housenumbers-orig green-orig brunnels-orig gesperrt-orig gesperrt_car-orig gesperrt_u-orig gesperrt_s-orig gesperrt_r-orig comments_cyclepath-orig comments_danger-orig comments_ferry-orig comments_misc-orig comments_mount-orig comments_path-orig comments_route-orig comments_trafficjam-orig comments_tram-orig comments_kfzverkehr-orig comments_scenic-orig fragezeichen-orig exits-orig culdesac-orig
 

data/doit.pl

@@ -55,7 +55,9 @@
 my @orig_files = bsd_glob("*-orig");
 my @fragezeichen_lowprio_bbd = defined $bbbikeauxdir ? "$bbbikeauxdir/bbd/fragezeichen_lowprio.bbd" : ();
 
-my @ADDITIONAL_SOURCEID_FILES	= ('routing_helper-orig', @fragezeichen_lowprio_bbd);
+my @ADDITIONAL_SOURCEID_FILES_MANDATORY	= ('routing_helper-orig');
+my @ADDITIONAL_SOURCEID_FILES_OPTIONAL  = (@fragezeichen_lowprio_bbd);
+my @ADDITIONAL_SOURCEID_FILES           = (@ADDITIONAL_SOURCEID_FILES_MANDATORY, @ADDITIONAL_SOURCEID_FILES_OPTIONAL);
 my @COMMENTS_PARTIAL	= qw(comments_cyclepath comments_danger comments_ferry comments_misc
 			     comments_mount comments_path comments_route
 			     comments_trafficjam comments_tram comments_kfzverkehr comments_scenic);
@@ -572,7 +574,19 @@ sub action_makefile_vars {
 # DO NOT EDIT, CHANGE THE VARIABLES in doit.pl and re-run doit.pl!
 
 EOF
-	for my $var (qw(ADDITIONAL_SOURCEID_FILES SOURCE_TARGETS_SOURCES COMMENTS_PARTIAL SOURCE_TARGETS)) {
+	# special handling for variable with optional files
+	{
+	    local $" = " ";
+	    $out .= <<"EOF";
+ADDITIONAL_SOURCEID_FILES=	@ADDITIONAL_SOURCEID_FILES_MANDATORY
+.if exists(\$(BBBIKEAUXDIR)/bbd/fragezeichen_lowprio.bbd)
+ADDITIONAL_SOURCEID_FILES+=	\$(BBBIKEAUXDIR)/bbd/fragezeichen_lowprio.bbd
+.endif
+
+EOF
+	}
+
+	for my $var (qw(SOURCE_TARGETS_SOURCES COMMENTS_PARTIAL SOURCE_TARGETS)) {
 	    my @vals = eval '@'.$var; die "Can't evaluate \@$var: $@" if $@;
 	    $out .= "$var=\t" . join(" ", @vals) . "\n\n";
 	}