diff --git a/Trigger/TrigT1/L1Common/CMakeLists.txt b/Trigger/TrigT1/L1Common/CMakeLists.txt
index 7bda754a59ee53a108807195264a948e14912ea6..13af140ac92b3f748419df595e8c9a8bbf514063 100644
--- a/Trigger/TrigT1/L1Common/CMakeLists.txt
+++ b/Trigger/TrigT1/L1Common/CMakeLists.txt
@@ -7,11 +7,6 @@
 # The name of the package:
 atlas_subdir( L1Common )
 
-# In release mode, stop here:
-if( ATLAS_RELEASE_MODE )
-   return()
-endif()
-
 # Find the necessary externals:
 find_package( Python COMPONENTS Interpreter )
 
@@ -30,11 +25,11 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/L1Common
    -i ${CMAKE_CURRENT_SOURCE_DIR}/schema/L1Specifications.xml
    COMMAND ${CMAKE_COMMAND} -E make_directory
    ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}/L1Common
-   COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/L1Common/*.h
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/L1Common/*.h
    ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}/L1Common
    COMMAND ${CMAKE_COMMAND} -E make_directory
    ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1Common
-   COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/L1Common/*.py
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/L1Common/*.py
    ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1Common
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/schema/L1Specifications.xml )
 add_custom_target( L1CommonGen ALL DEPENDS
@@ -43,9 +38,11 @@ add_dependencies( Package_L1Common L1CommonGen )
 
 # And install them:
 install( DIRECTORY ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}/L1Common
-   DESTINATION include )
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+   OPTIONAL )
 install( DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1Common
    DESTINATION ${CMAKE_INSTALL_PYTHONDIR}
+   OPTIONAL
    PATTERN "__init__.py" EXCLUDE )
 
 # Install the python code of the package:
diff --git a/Trigger/TrigT1/L1Topo/L1TopoHardware/CMakeLists.txt b/Trigger/TrigT1/L1Topo/L1TopoHardware/CMakeLists.txt
index 80b826f6b3811fbb1e147c4496a39b382e1ca4c8..89a87ed29df44f64a1698153e58464d42db88b51 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoHardware/CMakeLists.txt
+++ b/Trigger/TrigT1/L1Topo/L1TopoHardware/CMakeLists.txt
@@ -21,15 +21,6 @@ atlas_add_executable( TrigConfL1TopoGenPyHardware
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 
-# In release recompilation mode only parse the following if the package is
-# being rebuilt:
-if( ATLAS_RELEASE_RECOMPILE_DRYRUN )
-   return()
-endif()
-if( ATLAS_RELEASE_MODE AND NOT ATLAS_PACKAGE_RECOMPILE )
-   return()
-endif()
-
 # Create an auto-generated python description of the L1Topo hardware:
 add_custom_command( OUTPUT
    ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoHardware/L1TopoHardware.py
@@ -46,4 +37,5 @@ add_dependencies( Package_L1TopoHardware L1TopoPyGenHardware )
 # Install the auto-generated file:
 install( FILES
    ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoHardware/L1TopoHardware.py
-   DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/L1TopoHardware )
+   DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/L1TopoHardware
+   OPTIONAL )