Some major qmake shuffle to install headers in the right locations.

diff --git a/anidbudpclient.pro b/anidbudpclient.pro
index 67887f89593f67218264056782bacfacfeedbac0..eac36b1fe4dab4626bc63a60b11109c6646e0ce8 100644 (file)
--- a/anidbudpclient.pro
+++ b/anidbudpclient.pro
@@ -115,14 +115,26 @@ noencrypt {
        message(Disabled ENCRYPT support)
 }
 
-# RenameParser Files
+REV = $$system(git show-ref -s --verify refs/heads/master)
+DEFINES += REVISION=\"$${REV}\"
+
+target.path = $${PREFIX}/lib
+
+headers.path = $${PREFIX}/include/AniDBUdpClient
+headers.files = $$HEADERS
 
+conv_headers.path = $${PREFIX}/include/AniDBUdpClient
+conv_headers.files = $$CONV_HEADERS
+
+INSTALLS += target headers conv_headers
+
+# RenameParser Files
 !norenameparser {
 
        INCLUDEPATH += renameparser
        DEPENDPATH += renameparser
 
-       HEADERS += renameparser/renameengine.h \
+       RENAMEPARSER_HEADERS = renameparser/renameengine.h \
                renameparser/functions.h \
                renameparser/abstractparser.h \
                renameparser/ast.h \
@@ -139,7 +151,7 @@ noencrypt {
                renameparser/evaluatewalk.cpp \
                renameparser/analyzewalk.cpp
 
-       HEADERS += renameparser/AniAdd/renameparser.h \
+       RENAMEPARSER_ANIADD_HEADERS = renameparser/AniAdd/renameparser.h \
                renameparser/AniAdd/renamegrammar_p.h \
                renameparser/AniAdd/lexer.h
        SOURCES += renameparser/AniAdd/renameparser.cpp \
@@ -147,31 +159,30 @@ noencrypt {
                renameparser/AniAdd/lexer.cpp
 
        QT *= script
-       HEADERS += renameparser/ECMAScript/parser.h
+       RENAMEPARSER_ECMA_HEADERS += renameparser/ECMAScript/parser.h
        SOURCES += renameparser/ECMAScript/parser.cpp
 
+       HEADERS += $$RENAMEPARSER_HEADERS $$RENAMEPARSER_ANIADD_HEADERS $$RENAMEPARSER_ECMA_HEADERS
+
        RENAMEPARSER_CONV_HEADERS += include/RenameParser/RenameEngine
 
+
+       renameparser_headers.path = $${PREFIX}/include/RenameParser
+       renameparser_headers.files = $$RENAMEPARSER_HEADERS
+
+       renameparser_aniadd_headers.path = $${PREFIX}/include/RenameParser/AniAdd
+       renameparser_aniadd_headers.files = $$RENAMEPARSER_ANIADD_HEADERS
+
+       renameparser_ecma_headers.path = $${PREFIX}/include/RenameParser/ECMAScript
+       renameparser_ecma_headers.files = $$RENAMEPARSER_ECMA_HEADERS
+
        renameparser_conv_headers.path = $${PREFIX}/include/RenameParser
        renameparser_conv_headers.files = $$RENAMEPARSER_CONV_HEADERS
 
-       INSTALLS += renameparser_conv_headers
+       INSTALLS += renameparser_headers renameparser_aniadd_headers renameparser_ecma_headers renameparser_conv_headers
 }
 norenameparser {
        DEFINES += ANIDBUDPCLIENT_NO_RENAMEPARSER
        message(Disabled renameparser support)
 }
 
-REV = $$system(git show-ref -s --verify refs/heads/master)
-DEFINES += REVISION=\"$${REV}\"
-
-target.path = $${PREFIX}/lib
-
-headers.path = $${PREFIX}/include/AniDBUdpClient
-headers.files = $$HEADERS
-
-conv_headers.path = $${PREFIX}/include/AniDBUdpClient
-conv_headers.files = $$CONV_HEADERS
-
-INSTALLS += target headers conv_headers
-