@@ -105,11 +105,6 @@ CXX_FILE = $(patsubst $(ARTIFACT_BIN)/%.o,%.cpp, $(@))
105105CXX_HDR_PATHS = $(foreach hdr,$(ARTIFACT_HEADERS ) ,$(ARTIFACT_INC ) /$(hdr ) )
106106CXX_HEADERS = $(foreach path,$(CXX_HDR_PATHS ) ,$(call rwildcard, $(path ) , * .h) )
107107CXX_INSTHEADERS = $(patsubst $(ARTIFACT_INC ) /% ,$(DESTDIR )$(INCDIR ) /% ,$(CXX_HEADERS ) )
108- CXX_INSTALL_HEADERS =
109-
110- ifeq ($(HEADERS ) ,1)
111- CXX_INSTALL_HEADERS = 1
112- endif
113108
114109CXX_SSE_CFLAGS = -mmmx -m3dnow -msse
115110CXX_SSE2_CFLAGS = $(CXX_SSE_CFLAGS ) -msse2
@@ -206,8 +201,8 @@ $(ARTIFACT_PC):
206201install : all
207202 echo " Installing $( $( ARTIFACT_ID) _NAME) "
208203 mkdir -p " $( DESTDIR) $( LIBDIR) /pkgconfig"
209- $(if $(CXX_INSTALL_HEADERS ) , mkdir -p "$(DESTDIR )$(INCDIR ) ")
210- $(if $(CXX_INSTALL_HEADERS ) , cp -r "$(CXX_HDR_PATHS ) " "$(DESTDIR )$(INCDIR ) /")
204+ $(if $(filter $( INSTALL_HEADERS ) ,1 ) , mkdir -p "$(DESTDIR )$(INCDIR ) ")
205+ $(if $(filter $( INSTALL_HEADERS ) ,1 ) , cp -r "$(CXX_HDR_PATHS ) " "$(DESTDIR )$(INCDIR ) /")
211206 cp $(ARTIFACT_PC ) " $( DESTDIR) $( LIBDIR) /pkgconfig/"
212207 $(INSTALL ) $(ARTIFACT_LIB ) " $( DESTDIR) $( LIBDIR) /"
213208 cp $(ARTIFACT_SLIB ) " $( DESTDIR) $( LIBDIR) /"
0 commit comments