diff options
| author | Eskil Heyn Olsen <eskil@src.gnome.org> | 2000-06-02 10:58:13 +0000 |
|---|---|---|
| committer | Eskil Heyn Olsen <eskil@src.gnome.org> | 2000-06-02 10:58:13 +0000 |
| commit | 8bbdacb135277cbc1d15648c47a2e8ef93cf852a (patch) | |
| tree | 29df2f2576f143764f35488657862a7d270c9702 /nautilus-installer | |
| parent | ba852fa33a30e60dc5275c59fce11564343733ed (diff) | |
| download | nautilus-8bbdacb135277cbc1d15648c47a2e8ef93cf852a.tar.gz | |
Ensured that the current stuff in cvs builds a working installer. (closing
* components/services/install/lib/eazel-install-rpm-glue.c:
(do_rpm_install):
* components/services/install/lib/eazel-install-types.c:
(packagedata_new_from_rpm_header):
* nautilus-installer/src/Makefile:
* nautilus-installer/src/prescript:
Ensured that the current stuff in cvs builds a working installer.
(closing bug#969)
Diffstat (limited to 'nautilus-installer')
| -rw-r--r-- | nautilus-installer/src/Makefile | 4 | ||||
| -rw-r--r-- | nautilus-installer/src/prescript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nautilus-installer/src/Makefile b/nautilus-installer/src/Makefile index ba9487845..0da525fa0 100644 --- a/nautilus-installer/src/Makefile +++ b/nautilus-installer/src/Makefile @@ -61,7 +61,7 @@ host_alias = i686-pc-linux-gnu host_triplet = i686-pc-linux-gnu AS = @AS@ BONOBO_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include -I/gnome/include/gnome-xml -BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgdk_pixbuf -ltiff -ljpeg -lpng -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -ldl -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm +BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgmodule -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm CATALOGS = CATOBJEXT = .gmo CC = gcc @@ -97,7 +97,7 @@ GNOME_LIBS = -L/gnome/lib -L/usr/lib -lgnome -lgnomesupport -lesd -laudiofile -l GNORBA_CFLAGS = GNORBA_LIBS = GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/usr/X11R6/include -I/gnome/include/gnome-xml -GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgdk_pixbuf -ltiff -ljpeg -lpng -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl -lxml -lz +GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lgmodule -lglib -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz GTK_CFLAGS = GTK_LIBS = GT_NO = diff --git a/nautilus-installer/src/prescript b/nautilus-installer/src/prescript index cef0a719d..1e322e708 100644 --- a/nautilus-installer/src/prescript +++ b/nautilus-installer/src/prescript @@ -8,7 +8,7 @@ if test $UID -ne 0; then echo "" echo "Please enter root password at the prompt" xhost + localhost - su - -c "export DISPLAY=$DISPLAY && cd $PWD && sh $0" + su - -c "export DISPLAY=$DISPLAY && cd $PWD && echo Uncompressing... && sh $0" xhost - localhost exit fi |