Thread: [pgagent] Instatallation destination?
Hi, in the Debian package I notice that CMakeLists.txt installs README and LICENSE to /usr (no subdirectory!), and pgagent.sql to /usr/share. The first is clearly wrong, and the second somewhat debatable. As pgagent.sql is not really required (extension support), I added this patch: Don't install README and LICENSE which would otherwise end up in /usr, and don't install pgagent.sql to /usr/share. --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,11 +144,11 @@ IF (WIN32) INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION .) ELSE(WIN32) INSTALL(TARGETS pgagent DESTINATION bin) - INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share) + #INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share) ENDIF(WIN32) -INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .) -INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .) +#INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .) +#INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .) # Extension IF(PG_EXTENSION) What would be the proper fix? Christoph
Hi,
in the Debian package I notice that CMakeLists.txt installs README and
LICENSE to /usr (no subdirectory!), and pgagent.sql to /usr/share.
The first is clearly wrong, and the second somewhat debatable. As
pgagent.sql is not really required (extension support), I added this
patch:
Don't install README and LICENSE which would otherwise end up in /usr,
and don't install pgagent.sql to /usr/share.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,11 @@ IF (WIN32)
INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION .)
ELSE(WIN32)
INSTALL(TARGETS pgagent DESTINATION bin)
- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
+ #INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
ENDIF(WIN32)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
+#INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
+#INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
# Extension
IF(PG_EXTENSION)
What would be the proper fix?
Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/pgagent/bin/pgagent
-- Installing: /usr/local/pgagent/share/pgagent.sql
-- Installing: /usr/local/pgagent/./README
-- Installing: /usr/local/pgagent/./LICENSE
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent--4.0.sql
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent.control
-- Up-to-date: /Library/PostgreSQL/11/share/postgresql/extension/pgagent.control
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent--3.4--4.0.sql
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent--unpackaged--4.0.sql
Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/bin/pgagent
-- Installing: /usr/local/share/pgagent.sql
-- Installing: /usr/local/share/pgagent/README
-- Installing: /usr/local/share/pgagent/LICENSE
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent--4.0.sql
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent.control
-- Up-to-date: /Library/PostgreSQL/11/share/postgresql/extension/pgagent.control
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent--3.4--4.0.sql
-- Installing: /Library/PostgreSQL/11/share/postgresql/extension/pgagent--unpackaged--4.0.sql
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
laptop206-pn-in:build neelpatel$ sudo make install
Password:
[ 11%] Built target run
[100%] Built target pgagent
Install the project...
-- Install configuration: ""
-- Installing: /usr/local/bin/pgagent
-- Installing: /usr/local/share/pgagent/README
-- Installing: /usr/local/share/pgagent/LICENSE
-- Installing: /Library/PostgreSQL/9.4/share/postgresql/extension/pgagent--4.0.sql
-- Installing: /Library/PostgreSQL/9.4/share/postgresql/extension/pgagent.control
-- Installing: /Library/PostgreSQL/9.4/share/postgresql/extension/pgagent--3.4--4.0.sql
-- Installing: /Library/PostgreSQL/9.4/share/postgresql/extension/pgagent--unpackaged--4.0.sql
HiOn Fri, Jul 20, 2018 at 10:00 AM, Christoph Berg <myon@debian.org> wrote:Hi,
in the Debian package I notice that CMakeLists.txt installs README and
LICENSE to /usr (no subdirectory!), and pgagent.sql to /usr/share.
The first is clearly wrong, and the second somewhat debatable. As
pgagent.sql is not really required (extension support), I added this
patch:Urgh, yeah.
Don't install README and LICENSE which would otherwise end up in /usr,
and don't install pgagent.sql to /usr/share.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,11 @@ IF (WIN32)
INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION .)
ELSE(WIN32)
INSTALL(TARGETS pgagent DESTINATION bin)
- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
+ #INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
ENDIF(WIN32)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
+#INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
+#INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
# Extension
IF(PG_EXTENSION)
What would be the proper fix?I suspect we need to do something similar to PostgreSQL which (iirc) changes the layout slightly if the prefix includes "pgsql" or "postgresql". The current behaviour looks reasonable in that case; e.g.Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/pgagent/bin/pgagent
-- Installing: /usr/local/pgagent/share/
pgagent.sql -- Installing: /usr/local/pgagent/./README
-- Installing: /usr/local/pgagent/./LICENSE
-- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent-- 4.0.sql -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent. control -- Up-to-date: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent. control -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent-- 3.4--4.0.sql -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent-- unpackaged--4.0.sql However, if the prefix does not "pgagent" or "pgAgent", perhaps it should look more like:Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/bin/pgagent
-- Installing: /usr/local/share/pgagent.sql
-- Installing: /usr/local/share/pgagent/
README -- Installing: /usr/local/share/pgagent/
LICENSE -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent-- 4.0.sql -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent. control -- Up-to-date: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent. control -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent-- 3.4--4.0.sql -- Installing: /Library/PostgreSQL/11/share/
postgresql/extension/pgagent-- unpackaged--4.0.sql Does that look about right?Assuming so, can you implement please Neel?--Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Attachment
Hi Dave,Please find updated patch with the suggested changes. Now "pgagent.sql" is not required to moved to optional list.In my system, it shows below output.laptop206-pn-in:build neelpatel$ sudo make install
Password:
[ 11%] Built target run
[100%] Built target pgagent
Install the project...
-- Install configuration: ""
-- Installing: /usr/local/bin/pgagent
-- Installing: /usr/local/share/pgagent/
README -- Installing: /usr/local/share/pgagent/
LICENSE -- Installing: /Library/PostgreSQL/9.4/share/
postgresql/extension/pgagent-- 4.0.sql -- Installing: /Library/PostgreSQL/9.4/share/
postgresql/extension/pgagent. control -- Installing: /Library/PostgreSQL/9.4/share/
postgresql/extension/pgagent-- 3.4--4.0.sql -- Installing: /Library/PostgreSQL/9.4/share/
postgresql/extension/pgagent-- unpackaged--4.0.sql Do review it and let me know if i misunderstood.
Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/pgagent/bin/pgagent
-- Installing: /usr/local/pgagent/share/pgage
-- Installing: /usr/local/pgagent/./README
-- Installing: /usr/local/pgagent/./LICENSE
-- Installing: /Library/PostgreSQL/11/share/p
-- Installing: /Library/PostgreSQL/11/share/p
-- Up-to-date: /Library/PostgreSQL/11/share/p
-- Installing: /Library/PostgreSQL/11/share/p
-- Installing: /Library/PostgreSQL/11/share/p
Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/bin/pgagent
-- Installing: /usr/local/share/pgagent.sql
-- Installing: /usr/local/share/pgagent/READM
-- Installing: /usr/local/share/pgagent/LICEN
-- Installing: /Library/PostgreSQL/11/share/p
-- Installing: /Library/PostgreSQL/11/share/p
-- Up-to-date: /Library/PostgreSQL/11/share/p
-- Installing: /Library/PostgreSQL/11/share/p
-- Installing: /Library/PostgreSQL/11/share/p
Thanks,Neel PatelOn Fri, Jul 20, 2018 at 2:42 PM, Dave Page <dpage@pgadmin.org> wrote:HiOn Fri, Jul 20, 2018 at 10:00 AM, Christoph Berg <myon@debian.org> wrote:Hi,
in the Debian package I notice that CMakeLists.txt installs README and
LICENSE to /usr (no subdirectory!), and pgagent.sql to /usr/share.
The first is clearly wrong, and the second somewhat debatable. As
pgagent.sql is not really required (extension support), I added this
patch:Urgh, yeah.
Don't install README and LICENSE which would otherwise end up in /usr,
and don't install pgagent.sql to /usr/share.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,11 @@ IF (WIN32)
INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION .)
ELSE(WIN32)
INSTALL(TARGETS pgagent DESTINATION bin)
- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
+ #INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
ENDIF(WIN32)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
+#INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
+#INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
# Extension
IF(PG_EXTENSION)
What would be the proper fix?I suspect we need to do something similar to PostgreSQL which (iirc) changes the layout slightly if the prefix includes "pgsql" or "postgresql". The current behaviour looks reasonable in that case; e.g.Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/pgagent/bin/pgagent
-- Installing: /usr/local/pgagent/share/pgage
nt.sql -- Installing: /usr/local/pgagent/./README
-- Installing: /usr/local/pgagent/./LICENSE
-- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent--4 .0.sql -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent.co ntrol -- Up-to-date: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent.co ntrol -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent--3 .4--4.0.sql -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent--u npackaged--4.0.sql However, if the prefix does not "pgagent" or "pgAgent", perhaps it should look more like:Install the project...
-- Install configuration: "Release"
-- Installing: /usr/local/bin/pgagent
-- Installing: /usr/local/share/pgagent.sql
-- Installing: /usr/local/share/pgagent/READM
E -- Installing: /usr/local/share/pgagent/LICEN
SE -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent--4 .0.sql -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent.co ntrol -- Up-to-date: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent.co ntrol -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent--3 .4--4.0.sql -- Installing: /Library/PostgreSQL/11/share/p
ostgresql/extension/pgagent--u npackaged--4.0.sql Does that look about right?Assuming so, can you implement please Neel?--Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company