Преглед изворни кода

Fix hardcoded installation path.

This resolves issue #1.

Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/3/head
gregory guy пре 7 месеци
родитељ
комит
0228e7e696
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
6 измењених фајлова са 28 додато и 13 уклоњено
  1. +3
    -0
      config.h.cmake
  2. +1
    -0
      configure.in.in
  3. +6
    -2
      kdpkg-install/console.cpp
  4. +6
    -2
      kdpkg-install/install.cpp
  5. +6
    -3
      kdpkg-install/main.cpp
  6. +6
    -6
      kdpkg/main.cpp

+ 3
- 0
config.h.cmake Прегледај датотеку

@@ -6,3 +6,6 @@
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

/* Define the install PATH prefix */
#define PREFIX "@CMAKE_INSTALL_PREFIX@"

+ 1
- 0
configure.in.in Прегледај датотеку

@@ -4,3 +4,4 @@ AM_INIT_AUTOMAKE(kdpkg, 0.1)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN

AC_DEFINE_UNQUOTED([PREFIX], ["$prefix"], [Define the install PATH prefix])

+ 6
- 2
kdpkg-install/console.cpp Прегледај датотеку

@@ -18,7 +18,11 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/


#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PREFIX "/usr"
#endif

#include <kgenericfactory.h>
#include <kpushbutton.h>
@@ -53,7 +57,7 @@ console::console(TQWidget *parent, const TQStrList &run, const char *name, const

if ((pipe_prefix = popen(prefixcommand.c_str(), "r")) == NULL)
{
m_kdePrefix = "/usr";
m_kdePrefix = PREFIX;
}
else {
fgets(prefix_result, 2048, pipe_prefix);

+ 6
- 2
kdpkg-install/install.cpp Прегледај датотеку

@@ -17,7 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/


#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PREFIX "/usr"
#endif

#include <kgenericfactory.h>
#include <tdelocale.h>
@@ -70,7 +74,7 @@ install::install( const TQString &url, TQWidget *parent, const char *name, const

if ((pipe_prefix = popen(prefixcommand.c_str(), "r")) == NULL)
{
m_kdePrefix = "/usr";
m_kdePrefix = PREFIX;
}
else {
fgets(prefix_result, 2048, pipe_prefix);

+ 6
- 3
kdpkg-install/main.cpp Прегледај датотеку

@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PREFIX "/usr"
#endif

#include "install.h"

@@ -40,7 +45,7 @@ int main(int argc, char **argv)
// specify data for About dialog
TDEAboutData* about = new TDEAboutData("kdpkg-install", I18N_NOOP("kdpkg-install"), "");

about->setProgramLogo( TQImage("/usr/share/icons/hicolor/32x32/apps/kdpkg.png") );
about->setProgramLogo( TQImage( PREFIX "/share/icons/hicolor/32x32/apps/kdpkg.png") );
about->setShortDescription( I18N_NOOP("Frontend for dpkg.") );
about->setLicense(TDEAboutData::License_GPL_V2);
about->setHomepage("http://trinity.pearsoncomputing.net");
@@ -50,8 +55,6 @@ int main(int argc, char **argv)
about->addAuthor("Timothy Pearson (Trinity Project)", I18N_NOOP("Developer"), "kb9vqf@pearsoncomputing.net", "http://trinity.pearsoncomputing.net");
about->addAuthor("Fabian Würtz (xadras)", I18N_NOOP("Developer"), "xadras@sidux.com", "http://linux.wuertz.org/");



TDECmdLineArgs::init(argc, argv, about);
TDECmdLineArgs::addCmdLineOptions( options );


+ 6
- 6
kdpkg/main.cpp Прегледај датотеку

@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PREFIX "/usr"
#endif

#include "kdpkg.h"

@@ -40,7 +45,7 @@ int main(int argc, char **argv)
// specify data for About dialog
TDEAboutData* about = new TDEAboutData("kdpkg", I18N_NOOP("kdpkg"), "");

about->setProgramLogo( TQImage("/usr/share/icons/hicolor/32x32/apps/kdpkg.png") );
about->setProgramLogo( TQImage( PREFIX "/share/icons/hicolor/32x32/apps/kdpkg.png") );
about->setShortDescription( I18N_NOOP("Frontend for dpkg.") );
about->setLicense(TDEAboutData::License_GPL_V2);
about->setHomepage("http://trinity.pearsoncomputing.net");
@@ -50,11 +55,6 @@ int main(int argc, char **argv)
about->addAuthor("Timothy Pearson (Trinity Project)", I18N_NOOP("Developer"), "kb9vqf@pearsoncomputing.net", "http://trinity.pearsoncomputing.net");
about->addAuthor("Fabian Würtz (xadras)", I18N_NOOP("Developer"), "xadras@sidux.com", "http://xadras.wordpress.com/");




TDECmdLineArgs::init(argc, argv, about);
TDECmdLineArgs::addCmdLineOptions( options );


Loading…
Откажи
Сачувај