diff options
| author | doko <[email protected]> | 2012-02-27 21:53:21 +0100 |
|---|---|---|
| committer | doko <[email protected]> | 2012-02-27 21:53:21 +0100 |
| commit | 39f1ff14b49aa0a6cf35269025991eb819e60d78 (patch) | |
| tree | 08e45f169da3d79eff50be2121b523fa7abeb2b9 /Makefile.am | |
| parent | a6b12e16fd330edb07600ff867822a65245e151a (diff) | |
Define mime descriptions for 1.7, when built with Java7
2012-02-27 Matthias Klose <[email protected]>
* acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
* Makefile.am ($(PLUGIN_DIR)/%.o): Pass $(VERSION_DEFS)
* IcedTeaNPPlugin.cc (PLUGIN_MIME_DESC): Define in terms
of HAVE_JAVA7.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2ccb7a5..35584c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -213,7 +213,7 @@ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc mkdir -p $(PLUGIN_DIR) && \ cd $(PLUGIN_DIR) && \ $(CXX) $(CXXFLAGS) \ - $(DEFS) \ + $(DEFS) $(VERSION_DEFS) \ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ |