X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=f124aed6e86abbd6563e1e082393649eead51ce0;hb=9ce8b9ca5e954529fe216e1e6265fcbb27b20c2c;hp=fe6f657c9830ac5f3119c829c4f9bc5980004ff3;hpb=e368730948266bb88347ace7a1da642a4f8781a2;p=libsvgtiny.git diff --git a/Makefile b/Makefile index fe6f657..f124aed 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Component settings COMPONENT := svgtiny -COMPONENT_VERSION := 0.1.0 +COMPONENT_VERSION := 0.1.3 # Default to a static library COMPONENT_TYPE ?= lib-static @@ -16,8 +16,8 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -pedantic # BeOS/Haiku/AmigaOS standard library headers create warnings -ifneq ($(TARGET),beos) - ifneq ($(TARGET),amiga) +ifneq ($(BUILD),i586-pc-haiku) + ifneq ($(findstring amigaos,$(BUILD)),amigaos) WARNFLAGS := $(WARNFLAGS) -Werror endif endif @@ -47,5 +47,5 @@ include $(NSBUILD)/Makefile.top # Extra installation rules I := /include INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in -INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT) +INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in +INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)