b=?; fix make-makefile and cairo-features.h.in hack; r=ted

This commit is contained in:
Vladimir Vukicevic 2010-07-02 11:20:29 -07:00
parent 8894e5e9aa
commit 4cd467403f
2 changed files with 6 additions and 3 deletions

View File

@ -170,7 +170,9 @@ sub parse_arguments {
foreach $makefile (@args) {
$makefile =~ s/\.in$//;
$makefile =~ s/\/$//;
$makefile =~ /Makefile$/ or $makefile .= "/Makefile";
$makefile =~ /Makefile$/
or $makefile =~ /^\.\//
or $makefile .= "/Makefile";
push @makefiles, "$makefile";
}
@makefiles = "Makefile" unless @args;

View File

@ -43,8 +43,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
SUBMAKEFILES += cairo-features.h
ifndef MOZ_ENABLE_LIBXUL
VISIBILITY_FLAGS =
endif
@ -252,3 +250,6 @@ endif
ifdef MOZ_TREE_CAIRO
DEFINES += -DMOZ_TREE_CAIRO
endif
cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)
$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) ./$@